diff --git a/net/miniupnpc/Makefile b/net/miniupnpc/Makefile
index cd80bf4fc..9cf00e8f7 100644
--- a/net/miniupnpc/Makefile
+++ b/net/miniupnpc/Makefile
@@ -1,28 +1,72 @@
+#
+# Copyright (C) 2010-2011 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=miniupnpc
-PKG_VERSION:=1.4
-PKG_RELEASE:=2
+PKG_VERSION:=1.5
+PKG_RELEASE:=1
 
 PKG_SOURCE_URL:=http://miniupnp.free.fr/files
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_MD5SUM:=e8de10c42d64e77c321e57400d50e7e4
+PKG_MD5SUM:=0efa7498d27c82a56a0300b0c05c4f58
+
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
+define Package/miniupnpc/Default
+  TITLE:=Lightweight UPnP
+  URL:=http://miniupnp.tuxfamily.org/
+endef
+
 define Package/miniupnpc
+  $(call Package/miniupnpc/Default)
   SECTION:=net
   CATEGORY:=Network
   SUBMENU:=Firewall
-  TITLE:=Lightweight UPnP client
-  URL:=http://miniupnp.tuxfamily.org/
+  TITLE+= client
+  DEPENDS:=+libminiupnpc
+endef
+
+define Package/libminiupnpc
+  $(call Package/miniupnpc/Default)
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE+= library
 endef
 
 TARGET_CFLAGS += $(FPIC)
 
+MAKE_FLAGS += \
+	PREFIX="$(PKG_INSTALL_DIR)"
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include/miniupnpc
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/include/miniupnpc/*.h \
+		$(1)/usr/include/miniupnpc/
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/lib/*.{so*,a} \
+		$(1)/usr/lib/
+endef
+
 define Package/miniupnpc/install
 	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/upnpc-static $(1)/usr/bin/upnpc
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/upnpc $(1)/usr/bin/
+endef
+
+define Package/libminiupnpc/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(INSTALL_BIN) \
+		$(PKG_INSTALL_DIR)/usr/lib/libminiupnpc.so.* \
+		$(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,miniupnpc))
+$(eval $(call BuildPackage,libminiupnpc))
diff --git a/net/miniupnpc/patches/100-no_minixml_test.patch b/net/miniupnpc/patches/100-no_minixml_test.patch
index f215fa5ad..e549ef071 100644
--- a/net/miniupnpc/patches/100-no_minixml_test.patch
+++ b/net/miniupnpc/patches/100-no_minixml_test.patch
@@ -1,6 +1,6 @@
---- 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 @@
+--- a/Makefile
++++ b/Makefile
+@@ -107,8 +107,8 @@ installpythonmodule:	pythonmodule
  	python setup.py install
  
  validateminixml:	minixmlvalid
diff --git a/net/miniupnpc/patches/200-miniupnpc_desc.patch b/net/miniupnpc/patches/200-miniupnpc_desc.patch
index e2cfc01e5..9a3884786 100644
--- a/net/miniupnpc/patches/200-miniupnpc_desc.patch
+++ b/net/miniupnpc/patches/200-miniupnpc_desc.patch
@@ -1,6 +1,6 @@
---- 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 @@
+--- a/upnpcommands.c
++++ b/upnpcommands.c
+@@ -351,7 +351,7 @@ UPNP_AddPortMapping(const char * control
  	AddPortMappingArgs[5].elt = "NewEnabled";
  	AddPortMappingArgs[5].val = "1";
  	AddPortMappingArgs[6].elt = "NewPortMappingDescription";
@@ -8,4 +8,4 @@
 +	AddPortMappingArgs[6].val = desc?desc:"miniupnpc";
  	AddPortMappingArgs[7].elt = "NewLeaseDuration";
  	AddPortMappingArgs[7].val = "0";
- 	simpleUPnPcommand(-1, controlURL, servicetype, "AddPortMapping", AddPortMappingArgs, buffer, &bufsize);
+ 	if(simpleUPnPcommand(-1, controlURL, servicetype, "AddPortMapping", AddPortMappingArgs, buffer, &bufsize) < 0) {