diff --git a/buildroot/Config.raspberrypi3 b/buildroot/Config.raspberrypi3
index b16a499d38..dc19954f23 100644
--- a/buildroot/Config.raspberrypi3
+++ b/buildroot/Config.raspberrypi3
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Buildroot 2016.05-gdf262e0-dirty Configuration
+# Buildroot 2016.05-g01c2520-dirty Configuration
 #
 BR2_HAVE_DOT_CONFIG=y
 BR2_HOST_GCC_AT_LEAST_4_6=y
@@ -340,7 +340,7 @@ BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y
 BR2_SYSTEM_DHCP="eth0"
 # BR2_TARGET_TZ_INFO is not set
 BR2_ROOTFS_USERS_TABLES=""
-BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL)/overlay/base $(BR2_EXTERNAL)/overlay/rfd $(BR2_EXTERNAL)/overlay/WebUI"
+BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL)/overlay/base $(BR2_EXTERNAL)/overlay/rfd $(BR2_EXTERNAL)/overlay/HMServer $(BR2_EXTERNAL)/overlay/WebUI"
 BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi3/post-build.sh"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi3/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS=""
@@ -1853,7 +1853,7 @@ BR2_TARGET_ROOTFS_EXT2_REV=1
 BR2_TARGET_ROOTFS_EXT2_LABEL=""
 BR2_TARGET_ROOTFS_EXT2_BLOCKS=0
 BR2_TARGET_ROOTFS_EXT2_INODES=0
-BR2_TARGET_ROOTFS_EXT2_EXTRA_BLOCKS=0
+BR2_TARGET_ROOTFS_EXT2_EXTRA_BLOCKS=100000
 BR2_TARGET_ROOTFS_EXT2_EXTRA_INODES=0
 BR2_TARGET_ROOTFS_EXT2_RESBLKS=0
 BR2_TARGET_ROOTFS_EXT2_NONE=y
@@ -2234,11 +2234,15 @@ BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION=""
 #
 
 #
-# Homematic & Co
+# eQ-3 Homematic Services
 #
 BR2_PACKAGE_HOMEMATIC=y
-BR2_PACKAGE_HOMEMATIC_RF=y
-# BR2_PACKAGE_HOMEMATIC_WIRED is not set
-# BR2_PACKAGE_HOMEMATIC_IP_RF is not set
-# BR2_PACKAGE_HOMEMATIC_WEBUI is not set
+BR2_PACKAGE_HOMEMATIC_ARCH_ARM=y
+# BR2_PACKAGE_HOMEMATIC_ARCH_X86_32 is not set
+BR2_PACKAGE_HOMEMATIC_RF_PROTOCOL_HM_ONLY=y
+# BR2_PACKAGE_HOMEMATAIC_RF_PROTOCOL_HMIP_ONLY is not set
+# BR2_PACKAGE_HOMEMATAIC_RF_PROTOCOL_HM_HMIP is not set
+BR2_PACKAGE_HOMEMATIC_WIRED_PROTOCOL_HM_ONLY=y
+BR2_PACKAGE_HOMEMATIC_WEBUI=y
+BR2_PACKAGE_HOMEMATIC_HMSERVER=y
 BR2_PACKAGE_JAVA_AZUL=y
diff --git a/buildroot/buildroot-external/package/homematic/Config.in b/buildroot/buildroot-external/package/homematic/Config.in
index 69d99cecd2..213d70d1d7 100644
--- a/buildroot/buildroot-external/package/homematic/Config.in
+++ b/buildroot/buildroot-external/package/homematic/Config.in
@@ -7,23 +7,46 @@ config BR2_PACKAGE_HOMEMATIC
 
 if BR2_PACKAGE_HOMEMATIC
 
-config BR2_PACKAGE_HOMEMATIC_RF
-        boolean "HomeMatic RF Daemon"
-	default "false"
+choice
+	prompt "Architecture"
+
+config BR2_PACKAGE_HOMEMATIC_ARCH_ARM
+	bool "arm-gnueabihf"
+
+config BR2_PACKAGE_HOMEMATIC_ARCH_X86_32
+	bool "X86_32"
+	
+endchoice
+
+choice 
+	prompt "RF Protocol"
+
+config BR2_PACKAGE_HOMEMATIC_RF_PROTOCOL_HM_ONLY
+	bool "HM RF only"
         help
-          HomeMatic RF daemon
+          Support HomeMatic RF Protocol only
 
-config BR2_PACKAGE_HOMEMATIC_WIRED
-        boolean "HomeMatic Wired Daemon"
-	default "false"
+config BR2_PACKAGE_HOMEMATAIC_RF_PROTOCOL_HMIP_ONLY
+	bool "HmIP RF Only"
         help
-          HomeMatic Wired daemon
+          Support Homematic IP RF Protocol only
 
-config BR2_PACKAGE_HOMEMATIC_IP_RF
-        boolean "Homematic IP RF Daemon"
-	default "false"
+config BR2_PACKAGE_HOMEMATAIC_RF_PROTOCOL_HM_HMIP
+	bool "HM and HmIP RF"
         help
-          Homematic IP RF daemon
+          Support HomeMatic and Homematic IP RF Protocol
+
+endchoice
+
+choice
+	prompt "Wired Protocol"
+
+config BR2_PACKAGE_HOMEMATIC_WIRED_PROTOCOL_HM_ONLY
+        boolean "HM Wired only"
+        help
+          Support HomeMatic Wired Protocol only
+
+endchoice
 
 config BR2_PACKAGE_HOMEMATIC_WEBUI
         boolean "HomeMatic WebUI"
@@ -31,4 +54,10 @@ config BR2_PACKAGE_HOMEMATIC_WEBUI
         help
           HomeMatic WebUI 
 
+config BR2_PACKAGE_HOMEMATIC_HMSERVER
+        boolean "HomeMatic HM-Server"
+	default "false"
+        help
+          HomeMatic HM-Server
+
 endif
diff --git a/buildroot/buildroot-external/package/homematic/Makefile b/buildroot/buildroot-external/package/homematic/Makefile
index d737501631..63d7cafd62 100644
--- a/buildroot/buildroot-external/package/homematic/Makefile
+++ b/buildroot/buildroot-external/package/homematic/Makefile
@@ -29,6 +29,11 @@ install_lighttpd_arch:
 	cp -R $(OCCU_ARCH)/packages/lighttpd/lib/* $(TARGET_DIR)/usr/lib
 	cp -R $(OCCU_ARCH)/packages/lighttpd/etc/* $(TARGET_DIR)/etc
 
+install_hmserver:
+	mkdir -p $(TARGET_DIR)/opt/HMServer
+	cp -R HMserver/opt/HMServer/* $(TARGET_DIR)/opt/HMServer
+	cp -R HMserver/etc/config_templates/* $(TARGET_DIR)/etc/config_templates
+	cp -R HMserver/HMServer.jar $(TARGET_DIR)/opt/HMServer
 
 update_webui:
 	ln -sf /var/EULA.de                            $(TARGET_DIR)/www/rega/EULA.de
@@ -69,16 +74,12 @@ update_webui:
 
 
 install:
-	make install_rfd_arch OCCU_ARCH=arm-gnueabihf
-	make install_hs485d_arch OCCU_ARCH=arm-gnueabihf
-	make install_webui_arch OCCU_ARCH=arm-gnueabihf
-	make install_linuxbasis_arch OCCU_ARCH=arm-gnueabihf
-	make install_lighttpd_arch OCCU_ARCH=arm-gnueabihf
-#	make install_rfd_arch OCCU_ARCH=X86_32_Debian_Wheezy
-#	make install_hs485d_arch OCCU_ARCH=X86_32_Debian_Wheezy
-#	make install_webui_arch OCCU_ARCH=X86_32_Debian_Wheezy
-#	make install_linuxbasis_arch OCCU_ARCH=X86_32_Debian_Wheezy
-#	make install_lighttpd_arch OCCU_ARCH=X86_32_Debian_Wheezy
+	make install_rfd_arch OCCU_ARCH=$(HOMEMATIC_ARCH)
+	make install_hs485d_arch OCCU_ARCH=$(HOMEMATIC_ARCH)
+	make install_webui_arch OCCU_ARCH=$(HOMEMATIC_ARCH)
+	make install_linuxbasis_arch OCCU_ARCH=$(HOMEMATIC_ARCH)
+	make install_lighttpd_arch OCCU_ARCH=$(HOMEMATIC_ARCH)
+	make install_hmserver
 	sed -i -e 's/\/opt\/hm\//\//g' $(TARGET_DIR)/etc/lighttpd/lighttpd.conf
 	sed -i -e 's/\/opt\/hm\//\//g' $(TARGET_DIR)/etc/lighttpd/conf.d/cgi.conf
 	make update_webui
diff --git a/buildroot/buildroot-external/package/homematic/homematic.mk b/buildroot/buildroot-external/package/homematic/homematic.mk
index 207a0fd9dc..948493c2de 100644
--- a/buildroot/buildroot-external/package/homematic/homematic.mk
+++ b/buildroot/buildroot-external/package/homematic/homematic.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 # HOMEMATIC_VERSION = 2.21.10
-HOMEMATIC_VERSION = 5d1fb3d4eb1831c02b457a369096021252e0518e
+HOMEMATIC_VERSION = 28045df83480122f90ab92f7c6e625f9bf3b61aa
 HOMEMATIC_SITE = $(call github,eq-3,occu,$(HOMEMATIC_VERSION))
 
 # HOMEMATIC_SITE = $(TOPDIR)/../../../General/Buildroot/Modules/RFD
@@ -25,10 +25,30 @@ endef
 
 HOMEMATIC_PRE_PATCH_HOOKS += HOMEMATIC_PRE_PATCH
 
+ifeq ($(BR2_PACKAGE_HOMEMATIC_RF_PROTOCOL_HM_ONLY),y) 
+	HOMEMATIC_RF_PROTOCOL=HM
+endif
 
+ifeq ($(BR2_PACKAGE_HOMEMATIC_RF_PROTOCOL_HMIP_ONLY),y) 
+	HOMEMATIC_RF_PROTOCOL=HMIP
+endif
+
+ifeq ($(BR2_PACKAGE_HOMEMATIC_RF_PROTOCOL_HM_HMIP),y) 
+	HOMEMATIC_RF_PROTOCOL=HM_HMIP
+endif
+
+ifeq ($(BR2_PACKAGE_HOMEMATIC_ARCH_ARM),y) 
+	HOMEMATIC_ARCH=arm-gnueabihf
+endif
+
+ifeq ($(BR2_PACKAGE_HOMEMATIC_ARCH_X86_32),y) 
+	HOMEMATIC_ARCH=X86_32_Debian_Wheezy
+endif
 
 define HOMEMATIC_INSTALL_TARGET_CMDS
 		$(MAKE) HOMEMATIC_VERSION=$(HOMEMATIC_VERSION) \
+			HOMEMATIC_RF_PROTOCOL=$(HOMEMATIC_RF_PROTOCOL) \
+			HOMEMATIC_ARCH=$(HOMEMATIC_ARCH) \
 			-C $(@D) install 
 endef