*** ./Makefile.in.ORIG	Thu Apr  4 12:43:42 2013
--- ./Makefile.in	Thu Apr  4 12:43:50 2013
***************
*** 195,201 ****
  	$(am__objects_11) $(am__objects_12) $(am__objects_13) \
  	$(am__objects_14) $(am__objects_15)
  tmux_OBJECTS = $(dist_tmux_OBJECTS) $(nodist_tmux_OBJECTS)
! tmux_LDADD = $(LDADD)
  DEFAULT_INCLUDES = -I.@am__isrc@
  depcomp = $(SHELL) $(top_srcdir)/etc/depcomp
  am__depfiles_maybe = depfiles
--- 195,201 ----
  	$(am__objects_11) $(am__objects_12) $(am__objects_13) \
  	$(am__objects_14) $(am__objects_15)
  tmux_OBJECTS = $(dist_tmux_OBJECTS) $(nodist_tmux_OBJECTS)
! tmux_LDADD = $(LDADD) -lbsd
  DEFAULT_INCLUDES = -I.@am__isrc@
  depcomp = $(SHELL) $(top_srcdir)/etc/depcomp
  am__depfiles_maybe = depfiles
*** ./server-client.c.ORIG	Thu Apr  4 12:43:00 2013
--- ./server-client.c	Thu Apr  4 12:43:27 2013
***************
*** 334,339 ****
--- 334,351 ----
  	window_pane_mouse(wp, c->session, m);
  }
  
+ #ifdef _AIX
+ # define timersub(a, b, result)                                               \
+   do {                                                                        \
+     (result)->tv_sec = (a)->tv_sec - (b)->tv_sec;                             \
+     (result)->tv_usec = (a)->tv_usec - (b)->tv_usec;                          \
+     if ((result)->tv_usec < 0) {                                              \
+       --(result)->tv_sec;                                                     \
+       (result)->tv_usec += 1000000;                                           \
+     }                                                                         \
+   } while (0)
+ #endif
+ 
  /* Is this fast enough to probably be a paste? */
  int
  server_client_assume_paste(struct session *s)