diff --git a/net/miniupnpc/Makefile b/net/miniupnpc/Makefile
new file mode 100644
index 000000000..58741286f
--- /dev/null
+++ b/net/miniupnpc/Makefile
@@ -0,0 +1,27 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=miniupnpc
+PKG_VERSION:=1.4
+PKG_RELEASE:=2
+
+PKG_SOURCE_URL:=http://miniupnp.free.fr/files
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_MD5SUM:=e8de10c42d64e77c321e57400d50e7e4
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/miniupnpc
+  SECTION:=net
+  CATEGORY:=Network
+  TITLE:=Lightweight UPnP client
+  URL:=http://miniupnp.tuxfamily.org/
+endef
+
+TARGET_CFLAGS += $(FPIC)
+
+define Package/miniupnpc/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/upnpc-static $(1)/usr/bin/upnpc
+endef
+
+$(eval $(call BuildPackage,miniupnpc))
diff --git a/net/miniupnpc/patches/100-no_minixml_test.patch b/net/miniupnpc/patches/100-no_minixml_test.patch
new file mode 100644
index 000000000..f215fa5ad
--- /dev/null
+++ b/net/miniupnpc/patches/100-no_minixml_test.patch
@@ -0,0 +1,13 @@
+--- miniupnpc-1.4/Makefile	2009-10-10 12:19:40.000000000 -0700
++++ miniupnpc-1.4/Makefile	2010-03-03 13:31:02.000000000 -0800
+@@ -67,8 +67,8 @@
+ 	python setup.py install
+ 
+ validateminixml:	minixmlvalid
+-	@echo "minixml validation test"
+-	./minixmlvalid
++	@echo "(skipping) minixml validation test"
++#	./minixmlvalid
+ 	touch $@
+ 
+ clean:
diff --git a/net/miniupnpc/patches/200-miniupnpc_desc.patch b/net/miniupnpc/patches/200-miniupnpc_desc.patch
new file mode 100644
index 000000000..e2cfc01e5
--- /dev/null
+++ b/net/miniupnpc/patches/200-miniupnpc_desc.patch
@@ -0,0 +1,11 @@
+--- miniupnpc-1.4/upnpcommands.c	2009-07-13 01:44:43.000000000 -0700
++++ miniupnpc-1.4/upnpcommands.c	2010-03-03 13:33:21.000000000 -0800
+@@ -335,7 +335,7 @@
+ 	AddPortMappingArgs[5].elt = "NewEnabled";
+ 	AddPortMappingArgs[5].val = "1";
+ 	AddPortMappingArgs[6].elt = "NewPortMappingDescription";
+-	AddPortMappingArgs[6].val = desc?desc:"libminiupnpc";
++	AddPortMappingArgs[6].val = desc?desc:"miniupnpc";
+ 	AddPortMappingArgs[7].elt = "NewLeaseDuration";
+ 	AddPortMappingArgs[7].val = "0";
+ 	simpleUPnPcommand(-1, controlURL, servicetype, "AddPortMapping", AddPortMappingArgs, buffer, &bufsize);