diff --git a/ChangeLog b/ChangeLog
index 0f132cb01..8a832d41d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-01-08  Grégoire Sutre  <gregoire.sutre@gmail.com>
+
+	* configure.ac: Check for libdevmapper header.
+
 2011-01-08  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/fs/zfs/zfs.c (dmu_read): Use void * for some pointers to
diff --git a/configure.ac b/configure.ac
index 8bb585a78..a9ca130b4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -863,6 +863,12 @@ if test x"$enable_device_mapper" = xno ; then
   device_mapper_excuse="explicitly disabled"
 fi
 
+if test x"$device_mapper_excuse" = x ; then
+  # Check for device-mapper header.
+  AC_CHECK_HEADER([libdevmapper.h], [],
+               [device_mapper_excuse="need libdevmapper header"])
+fi
+
 if test x"$device_mapper_excuse" = x ; then
   # Check for device-mapper library.
   AC_CHECK_LIB([devmapper], [dm_task_create], [],