diff --git a/base/device-mapper/device-mapper.conf b/base/device-mapper/device-mapper.conf
index 9a876c2bd..7ea66a147 100644
--- a/base/device-mapper/device-mapper.conf
+++ b/base/device-mapper/device-mapper.conf
@@ -2,7 +2,7 @@
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # Filename: package/.../device-mapper/device-mapper.conf
-# Copyright (C) 2007 The OpenSDE Project
+# Copyright (C) 2007 - 2008 The OpenSDE Project
 # Copyright (C) 2004 - 2006 The T2 SDE Project
 #
 # More information can be found in the files COPYING and README.
@@ -16,7 +16,7 @@
 prefix=
 set_confopt
 
-if [ "$SDECFG_STATIC" == 1 ]; then
+if [ "$SDECFG_STATIC" == 1 -o "$SDECFG_DIETLIBC_device_mapper" == 1 ]; then
 	var_append patchfiles ' ' "$confdir/no_dynamic.diff"
 	var_append confopt ' ' '--enable-static_link=yes'
 	libdir="/usr/lib"
diff --git a/base/device-mapper/device-mapper.desc b/base/device-mapper/device-mapper.desc
index 0ac09467b..10458854c 100644
--- a/base/device-mapper/device-mapper.desc
+++ b/base/device-mapper/device-mapper.desc
@@ -27,6 +27,7 @@
 [M] Alejandro Mery <amery@opensde.org>
 
 [C] extra/filesystem
+[F] DIETLIBC
 
 [L] GPL
 [S] Stable