diff --git a/libs/libmicrohttpd/Makefile b/libs/libmicrohttpd/Makefile
index 78ad1ce6..c8f8ddbe 100644
--- a/libs/libmicrohttpd/Makefile
+++ b/libs/libmicrohttpd/Makefile
@@ -8,87 +8,84 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libmicrohttpd
-PKG_VERSION:=0.9.59
+PKG_VERSION:=0.9.69
 PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@GNU/libmicrohttpd
-PKG_HASH:=9b9ccd7d0b11b0e179f1f58dc2caa3e0c62c8609e1e1dc7dcaadf941b67d923c
-
 PKG_MAINTAINER:=Alexander Couzens <lynxis@fe80.eu>
-
 PKG_LICENSE:=LGPL-2.1
 PKG_LICENSE_FILES:=COPYING
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_BUILD_PARALLEL:=1
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=@GNU/libmicrohttpd
+PKG_HASH:=fb9b6b148b787493e637d3083588711e65cbcb726fa02cee2cd543c5de27e37e
 
+PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/libmicrohttpd/Default
-   SECTION:=libs
-   CATEGORY:=Libraries
-   TITLE:=GNU libmicrohttpd is a library that runs an HTTP server.
-   URL:=http://www.gnu.org/software/libmicrohttpd/
-endef
-
-define Package/libmicrohttpd
-$(call Package/libmicrohttpd/Default)
-   TITLE+=(with-ssl)
-   DEPENDS:=+libpthread +libgcrypt +libgnutls +libgpg-error
+define Package/libmicrohttpd/default
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=GNU libmicrohttpd is a library that runs an HTTP server.
+  URL:=http://www.gnu.org/software/libmicrohttpd/
 endef
 
 define Package/libmicrohttpd-no-ssl
-$(call Package/libmicrohttpd/Default)
-   TITLE+=(no-ssl)
-   DEPENDS:=+libpthread
-   VARIANT:=no-ssl
-   CONFLICTS:=libmicrohttpd
+$(call Package/libmicrohttpd/default)
+  VARIANT:=nossl
+  DEFAULT_VARIANT:=1
+  PROVIDES:=libmicrohttpd
 endef
 
-define Package/libmicrohttpd/description/Default
-	GNU libmicrohttpd is a small C library that is supposed to make it easy
-	to run an HTTP server as part of another application.
-endef
-
-define Package/libmicrohttpd-no-ssl/description
-$(call Package/libmicrohttp/description/Default)
+define Package/libmicrohttpd-ssl
+$(call Package/libmicrohttpd/default)
+  TITLE+= with SSL support
+  VARIANT:=ssl
+  DEPENDS:=+libgcrypt +libgnutls +libgpg-error
+  PROVIDES:=libmicrohttpd
 endef
 
 CONFIGURE_ARGS+= \
 	--disable-curl \
-	--disable-spdy \
-	--without-openssl
+	--disable-rpath \
+	--disable-doc \
+	--disable-examples \
+	--enable-poll=no \
+	--enable-epoll=yes \
 
-ifeq ($(BUILD_VARIANT),no-ssl)
-CONFIGURE_ARGS += \
-	--disable-https \
-	--without-gnutls
-else
+ifeq ($(BUILD_VARIANT),ssl)
 CONFIGURE_ARGS += \
 	--enable-https \
 	--with-gnutls
+else
+CONFIGURE_ARGS += \
+	--disable-https \
+	--without-gnutls
 endif
 
+define Package/libmicrohttpd/description
+  GNU libmicrohttpd is a small C library that is supposed to make it easy
+  to run an HTTP server as part of another application.
+endef
+
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include/
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/microhttpd.h $(1)/usr/include/
 	$(INSTALL_DIR) $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libmicrohttpd.{so*,a,la} $(1)/usr/lib/
 	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig/
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* $(1)/usr/lib/pkgconfig/
-endef
-
-define Package/libmicrohttpd/install
-	$(INSTALL_DIR) $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib/
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libmicrohttpd.pc $(1)/usr/lib/pkgconfig/
 endef
 
 define Package/libmicrohttpd-no-ssl/install
-$(call Package/libmicrohttpd/install,$1)
+	$(INSTALL_DIR) $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libmicrohttpd.so* $(1)/usr/lib/
+endef
+
+define Package/libmicrohttpd-ssl/install
+	$(INSTALL_DIR) $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libmicrohttpd.so* $(1)/usr/lib/
 endef
 
-$(eval $(call BuildPackage,libmicrohttpd))
 $(eval $(call BuildPackage,libmicrohttpd-no-ssl))
+$(eval $(call BuildPackage,libmicrohttpd-ssl))