diff --git a/base/lvm2/dietlibc.patch b/base/lvm2/dietlibc.patch
new file mode 100644
index 000000000..568868414
--- /dev/null
+++ b/base/lvm2/dietlibc.patch
@@ -0,0 +1,25 @@
+# --- SDE-COPYRIGHT-NOTE-BEGIN ---
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+# 
+# Filename: package/.../lvm2/dietlibc.patch
+# Copyright (C) 2007 The OpenSDE Project
+# 
+# More information can be found in the files COPYING and README.
+# 
+# This patch file is dual-licensed. It is available under the license the
+# patched project is licensed under, as long as it is an OpenSource license
+# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
+# of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+# --- SDE-COPYRIGHT-NOTE-END ---
+
+--- ./lib/misc/lib.h.orig	2007-07-18 21:00:06.000000000 -0400
++++ ./lib/misc/lib.h	2007-07-18 21:00:36.000000000 -0400
+@@ -31,5 +31,6 @@
+ #include "lvm-wrappers.h"
+ 
+ #include <libdevmapper.h>
++#include <stdint.h>
+ 
+ #endif
diff --git a/base/lvm2/no_dynamic.diff b/base/lvm2/no_dynamic.diff
index 1d8651e2b..5bb4cbc9f 100644
--- a/base/lvm2/no_dynamic.diff
+++ b/base/lvm2/no_dynamic.diff
@@ -52,22 +52,34 @@
  	INSTALL_TARGETS += $(INSTALL_CMDLIB_TARGETS)
  endif
  
-@@ -168,9 +167,16 @@
- 		done; \
- 	)
+--- ./tools/Makefile.in.orig	2007-07-18 20:11:11.000000000 -0400
++++ ./tools/Makefile.in	2007-07-18 20:12:41.000000000 -0400
+@@ -105,7 +105,7 @@
  
--install_tools_static: lvm.static
-+install_tools_static: lvm.static .commands
- 	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) lvm.static \
--		$(staticdir)/lvm.static
-+		$(staticdir)/lvm
-+	@echo Creating symbolic links for individual commands in $(sbindir)
-+	@( \
-+		for v in `cat .commands`; do \
-+			cd $(sbindir); \
-+			$(LN_S) -f lvm $$v; \
-+		done; \
-+	)
- 
- install: $(INSTALL_TARGETS)
+ lvm.static: $(OBJECTS) lvm-static.o $(top_srcdir)/lib/liblvm.a
+ 	$(CC) -o $@ $(CFLAGS) $(OBJECTS) lvm-static.o -static \
+-		$(LDFLAGS) $(LVMLIBS) $(LIBS) -rdynamic
++		$(LDFLAGS) $(LVMLIBS) $(LIBS)
  
+ liblvm2cmd.a: $(top_srcdir)/lib/liblvm.a $(OBJECTS) lvmcmdlib.o lvm2cmd.o
+ 	cat $(top_srcdir)/lib/liblvm.a > $@
+--- ./configure.orig	2007-07-18 20:19:25.000000000 -0400
++++ ./configure	2007-07-18 20:19:44.000000000 -0400
+@@ -1948,7 +1948,6 @@
+ 		CLDWHOLEARCHIVE="-Wl,-whole-archive"
+ 		CLDNOWHOLEARCHIVE="-Wl,-no-whole-archive"
+ 		LDDEPS="$LDDEPS .export.sym"
+-		LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
+ 		LIB_SUFFIX="so"
+ 		DEVMAPPER=yes
+ 		ODIRECT=yes
+--- ./configure.in.orig	2007-07-18 20:22:31.000000000 -0400
++++ ./configure.in	2007-07-18 20:22:42.000000000 -0400
+@@ -37,7 +37,6 @@
+ 		CLDWHOLEARCHIVE="-Wl,-whole-archive"
+ 		CLDNOWHOLEARCHIVE="-Wl,-no-whole-archive"
+ 		LDDEPS="$LDDEPS .export.sym"
+-		LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
+ 		LIB_SUFFIX="so"
+ 		DEVMAPPER=yes
+ 		ODIRECT=yes