diff -ur mkinitrd-6.0.93.orig/bdevid/python/Makefile mkinitrd-6.0.93/bdevid/python/Makefile
--- mkinitrd-6.0.93.orig/bdevid/python/Makefile	2009-12-09 13:31:27.000000000 +0200
+++ mkinitrd-6.0.93/bdevid/python/Makefile	2009-12-09 14:03:23.000000000 +0200
@@ -28,12 +28,11 @@
 PYVER := $(shell python -c "import sys; print sys.version[0:3]")
 CFLAGS += -I/usr/include/python$(PYVER)
 CFLAGS += -I$(TOPDIR)/nash/include -I$(TOPDIR)/bdevid/include
-LDFLAGS = -shared -L$(TOPDIR)/nash -L$(TOPDIR)/bdevid
+LDFLAGS += -shared -L$(TOPDIR)/nash -L$(TOPDIR)/bdevid
 LDFLAGS += -Wl,-soname="pybdevid.so.$(VERSION)",--as-needed
-LDFLAGS += -lpython$(PYVER) -ldl
 
 pybdevid_OBJECTS = pybdevid.o
-pybdevid_LIBS = -lbdevid -lnash -ldevmapper -lparted -lblkid
+pybdevid_LIBS = -lpython$(PYVER) -ldl -lbdevid -lnash -ldevmapper -lparted -lblkid
 
 pybdevid.so :: $(pybdevid_OBJECTS)
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ -lbdevid $(pybdevid_LIBS)
diff -ur mkinitrd-6.0.93.orig/Makefile.inc mkinitrd-6.0.93/Makefile.inc
--- mkinitrd-6.0.93.orig/Makefile.inc	2009-12-09 13:31:27.000000000 +0200
+++ mkinitrd-6.0.93/Makefile.inc	2009-12-09 14:02:30.000000000 +0200
@@ -31,10 +31,10 @@
 ARCH := $(patsubst sparc%,sparc,$(ARCH))
 ARCH := $(patsubst ppc%,ppc,$(ARCH))
 
-CC = gcc
-CFLAGS ?= -Wall -Werror -g -D_FORTIFY_SOURCE=2 -Wno-unused-function -fPIC \
+CC ?= gcc
+CFLAGS += -Wall -D_FORTIFY_SOURCE=2 -Wno-unused-function -fPIC \
 	  -std=gnu99 -D_GNU_SOURCE=1
-LDFLAGS ?= -Wl,--wrap,open,--wrap,fopen,--wrap,opendir,--wrap,socket \
+LDFLAGS += -Wl,--wrap,open,--wrap,fopen,--wrap,opendir,--wrap,socket \
 	-Wl,--wrap,pipe,--wrap,mkdir,--wrap,access
 
 mandir = usr/share/man