diff -ru a/miniupnpd-1.5_pre20091222.ebuild b/miniupnpd-1.5_pre20091222.ebuild
--- a/miniupnpd-1.5_pre20091222.ebuild	2010-03-02 22:36:43.000000000 +0000
+++ b/miniupnpd-1.5_pre20091222.ebuild	2010-09-21 03:56:11.591866929 +0000
@@ -20,15 +20,24 @@
 RDEPEND=">=net-firewall/iptables-1.4.6
 	sys-apps/lsb-release
 	>=sys-kernel/linux-headers-2.6.31"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	sys-apps/util-linux
+	"
 
 src_prepare() {
 	mv Makefile.linux Makefile
 	epatch "${FILESDIR}/${PN}-1.3-iptables_path.diff"
 	epatch "${FILESDIR}/${PN}-1.3-Makefile_fix.diff"
 	epatch "${FILESDIR}/${PN}-1.5-iptcrdr.diff"
-	sed -i -e "s#^CFLAGS = #CFLAGS = -I${KV_OUT_DIR}/include #" Makefile
-	sed -i "s/LIBS = -liptc/LIBS = -lip4tc/g" Makefile
+	sed -i \
+		-e "s#^CFLAGS = .*-D#CPPFLAGS += -I${KERNEL_DIR}/include -D#" \
+		-e '/^CFLAGS :=/s/CFLAGS/CPPFLAGS/g' \
+		-e "s/LIBS = -liptc/LIBS = -lip4tc/g" \
+		-e 's/genuuid||//' \
+		Makefile || die
+	sed -i \
+		-e 's/\(strncpy(\([->a-z.]\+\), "[a-zA-Z]\+", \)IPT_FUNCTION_MAXNAMELEN);/\1sizeof(\2));/' \
+		netfilter/iptcrdr.c || die
 	emake config.h
 }