diff --git a/Utility/diskfree.c b/Utility/diskfree.c
index 6e9eda930f..968d2b8b50 100644
--- a/Utility/diskfree.c
+++ b/Utility/diskfree.c
@@ -27,6 +27,7 @@
 # include <sys/mount.h>
 # define STATCALL statfs64
 # define STATSTRUCT statfs
+# define UNKNOWN /* temporarily disabled; trying to nail down a build failure */
 #else
 #if defined (__linux__)
 /* This is a POSIX standard, so might also work elsewhere. */
diff --git a/debian/changelog b/debian/changelog
index 6306bc859d..581c7d04fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+git-annex (3.20120406) UNRELEASED; urgency=low
+
+  * Disable diskfree on kfreebsd, as I have a build failure on kfreebsd-i386
+    that is quite likely caused by it.
+
+ -- Joey Hess <joeyh@debian.org>  Sat, 07 Apr 2012 15:49:41 -0400
+
 git-annex (3.20120405) unstable; urgency=low
 
   * Rewrote free disk space checking code, moving the portability