diff --git a/debian/changelog b/debian/changelog
index 570f5174..99c8342b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+libgtop2 (2.28.4-3) UNRELEASED; urgency=low
+
+  * debian/patches/06_kfreebsd_sys_pipe.patch: Don't include sys/pipe.h on
+    kFreeBSD. Defining _KERNEL to include sys/pipe.h subsequently breaks
+    sys/conf.h; since sys/pipe.h is not meant to be used in userland, and
+    libgtop2 builds anyway on kFreeBSD without it, don't include it.
+    Thanks to Steven Chamberlain for the patch. Closes: #667984
+
+ -- Michael Biebl <biebl@debian.org>  Fri, 13 Apr 2012 19:59:36 +0200
+
 libgtop2 (2.28.4-2) unstable; urgency=low
 
   * debian/watch: Track .xz tarballs.
diff --git a/debian/patches/06_kfreebsd_sys_pipe.patch b/debian/patches/06_kfreebsd_sys_pipe.patch
new file mode 100644
index 00000000..94e3f06a
--- /dev/null
+++ b/debian/patches/06_kfreebsd_sys_pipe.patch
@@ -0,0 +1,22 @@
+Description: Don't include sys/pipe.h on kFreeBSD
+ Defining _KERNEL to include sys/pipe.h subsequently breaks sys/conf.h;
+ since sys/pipe.h is not meant to be used in userland, and libgtop2 builds
+ anyway on kFreeBSD without it, don't include it.
+Author: Steven Chamberlain <steven@pyro.eu.org>
+Bug-Debian: http://bugs.debian.org/667984
+
+Index: libgtop2-2.28.4/sysdeps/freebsd/procmap.c
+===================================================================
+--- libgtop2-2.28.4.orig/sysdeps/freebsd/procmap.c	2012-04-07 22:49:20.000000000 +0100
++++ libgtop2-2.28.4/sysdeps/freebsd/procmap.c	2012-04-07 22:51:00.163079809 +0100
+@@ -38,10 +38,7 @@
+ #include <sys/vnode.h>
+ #undef _KVM_VNODE
+ 
+-#define _KERNEL
+-#include <sys/pipe.h>
+ #include <sys/conf.h>
+-#undef _KERNEL
+ #if (__FreeBSD_version >= 800038) || (__FreeBSD_kernel_version >= 800038)
+ #define _WANT_FILE
+ #include <sys/file.h>
diff --git a/debian/patches/series b/debian/patches/series
index d661825e..0c391b9b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,4 +3,5 @@
 03_kfreebsd_installdirs.patch
 04_kfreebsd_version_check.patch
 05_kfreebsd_8.0.patch
+06_kfreebsd_sys_pipe.patch
 99_ltmain_as-needed.patch