diff --git a/compat.h b/compat.h
index f52d0a1a..3db11bc0 100644
--- a/compat.h
+++ b/compat.h
@@ -1,4 +1,4 @@
-/* $Id: compat.h,v 1.24 2010-06-05 16:29:40 nicm Exp $ */
+/* $Id: compat.h,v 1.25 2010-06-06 13:00:46 tcunha Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -81,6 +81,8 @@ typedef uint64_t u_int64_t;
 
 #ifndef HAVE_IMSG
 #include "compat/imsg.h"
+#else
+#include <imsg.h>
 #endif
 
 #ifdef HAVE_BROKEN_CMSG_FIRSTHDR
diff --git a/configure b/configure
index c4836391..3aed7c73 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: configure,v 1.52 2010-06-05 18:14:29 nicm Exp $
+# $Id: configure,v 1.53 2010-06-06 13:00:47 tcunha Exp $
 #
 # Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
 #
@@ -67,6 +67,7 @@ case $TMUX_PLATFORM in
 #define HAVE_FGETLN
 #define HAVE_FORKPTY
 #define HAVE_GETOPT
+#define HAVE_IMSG
 #define HAVE_PATHS_H
 #define HAVE_PROGNAME
 #define HAVE_QUEUE_H
@@ -84,9 +85,7 @@ case $TMUX_PLATFORM in
 EOF
 	cat <<EOF >>$CONFIG_MK
 LIBS+= -lcurses -lutil -levent
-SRCS+= osdep-openbsd.c \
-	compat/imsg-buffer.c \
-	compat/imsg.c
+SRCS+= osdep-openbsd.c
 EOF
 	;;
 # ------------------------------------------------------------------------------