diff --git a/debian/control.in b/debian/control.in
index 56a9928b..5af8a6a9 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -7,18 +7,20 @@ Source: e2fsprogs
 Section: admin
 Priority: required
 Maintainer: Theodore Y. Ts'o <tytso@mit.edu>
-Build-Depends: gettext, texinfo, pkg-config, gcc-multilib [mips mipsel], libfuse-dev, libattr1-dev, debhelper (>= 9.0), UTIL_LINUX_NG_DEFINES m4
+Build-Depends: gettext, texinfo, pkg-config, gcc-multilib [mips mipsel], libfuse-dev [linux-any kfreebsd-any], libattr1-dev, debhelper (>= 9.0), UTIL_LINUX_NG_DEFINES m4
 Standards-Version: 3.9.8
 Homepage: http://e2fsprogs.sourceforge.net
 
+ifdef(`FUSE2FS',``
 Package: fuse2fs
 Priority: optional
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Architecture: any
+Architecture: linux-any kfreebsd-any
 Description: ext2 / ext3 / ext4 file system driver for FUSE
  fuse2fs is a FUSE file system client that supports reading and
  writing from devices or image files containing ext2, ext3, and ext4
  file systems.
+'')dnl
 
 ifdef(`E2FSCK_STATIC',``
 Package: e2fsck-static
diff --git a/debian/rules b/debian/rules
index b908b1b9..e6c419a5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,6 +27,10 @@ DEB_HOST_MULTIARCH	?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null
 DISTRO :=$(shell sed -ne '/DISTRIB_ID/s/.*=//p' /etc/lsb-release 2>/dev/null || echo Debian)
 UTIL_LINUX_NG ?= yes
 
+ifeq ($(DEB_BUILD_GNU_SYSTEM), gnu)
+SKIP_FUSE2FS=yes
+endif
+
 DH_VERSION := $(shell dpkg-query -W -f '$${Version}' debhelper)
 
 # USE_DBGSYM :=
@@ -177,7 +181,7 @@ UTIL_CONF_FLAGS ?= --enable-fsck --enable-libblkid \
 			--enable-libuuid --enable-uuidd
 endif
 
-ifeq ($(DEB_BUILD_GNU_SYSTEM), gnu) 
+ifneq ($(SKIP_FUSE2FS),)
 UTIL_CONF_FLAGS +=  --disable-fuse2fs
 endif
 
@@ -252,6 +256,12 @@ else
 M4_ARGS+=-UUDEB_PKGS
 endif
 
+ifeq ($(SKIP_FUSE2FS),)
+M4_ARGS+=-DFUSE2FS
+else
+M4_ARGS+=-UFUSE2FS
+endif
+
 FILES_FIXUP= libcomerr2.files comerr-dev.files libss2.files ss-dev.files \
 	libuuid1.files uuid-dev.files libblkid1.files libblkid-dev.files \
 	e2fslibs.files e2fslibs-dev.files
@@ -607,8 +617,10 @@ ifeq ($(SKIP_UDEB),)
 	dh_shlibdeps -pe2fsprogs-udeb -l${stdbuilddir}/lib \
 		-u"-Ldebian/e2fsprogs-udeb.shlibs.local"
 endif
+ifeq ($(SKIP_FUSE2FS),)
 	dh_shlibdeps -pfuse2fs -l${stdbuilddir}/lib \
 		-u"-Ldebian/e2fsprogs.shlibs.local"
+endif
 
 	dh_gencontrol -Ncomerr-dev -Nss-dev -Nuuid-dev \
 		-Ne2fsprogs-udeb -Nlibblkid1-udeb -Nlibuuid1-udeb