diff --git a/configure b/configure
index f522c9884..4798d5e02 100755
--- a/configure
+++ b/configure
@@ -12093,6 +12093,17 @@ BUILD_DMFILEMAPD=$DMFILEMAPD
 $as_echo "#define DMFILEMAPD 1" >>confdefs.h
 
 
+if test "$DMFILEMAPD" = yes; then
+   ac_fn_c_check_header_mongrel "$LINENO" "linux/fiemap.h" "ac_cv_header_linux_fiemap_h" "$ac_includes_default"
+if test "x$ac_cv_header_linux_fiemap_h" = xyes; then :
+
+else
+  as_fn_error $? "--enable-dmfilemapd requires fiemap.h" "$LINENO" 5
+fi
+
+
+fi
+
 ################################################################################
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build notifydbus" >&5
 $as_echo_n "checking whether to build notifydbus... " >&6; }
@@ -15159,7 +15170,6 @@ done
 
 fi
 
-
 ################################################################################
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}modprobe", so it can be a program name with args.
diff --git a/configure.in b/configure.in
index bf7ad9719..9dfb83672 100644
--- a/configure.in
+++ b/configure.in
@@ -1281,6 +1281,11 @@ AC_MSG_RESULT($DMFILEMAPD)
 BUILD_DMFILEMAPD=$DMFILEMAPD
 AC_DEFINE([DMFILEMAPD], 1, [Define to 1 to enable the device-mapper filemap daemon.])
 
+dnl -- dmfilemapd requires FIEMAP
+if test "$DMFILEMAPD" = yes; then
+   AC_CHECK_HEADER([linux/fiemap.h], , [AC_MSG_ERROR(--enable-dmfilemapd requires fiemap.h)])
+fi
+
 ################################################################################
 dnl -- Build notifydbus
 AC_MSG_CHECKING(whether to build notifydbus)