diff --git a/modules b/modules
index e88705d..25756ab 100644
--- a/modules
+++ b/modules
@@ -1,9 +1,9 @@
 GLUON_SITE_FEEDS='ffmuc_packages'
 
 PACKAGES_FFMUC_PACKAGES_REPO=https://github.com/freifunkMUC/gluon-packages.git
-PACKAGES_FFMUC_PACKAGES_COMMIT=82e721ad5d7c9eca8728954cfa1ab1d5b9168487
+PACKAGES_FFMUC_PACKAGES_COMMIT=d4d5aa3e3874ca6099e91fd70008ad5d54038169
 
-GLUON_SITE_FEEDS='gluon_community_repositorys'
+GLUON_SITE_FEEDS='gluon_community'
 
-PACKAGES_GLUON_COMMUNITY_REPOSITORYS_REPO=https://github.com/freifunk-gcp/v2015.1
-PACKAGES_GLUON_COMMUNITY_REPOSITORYS_COMMIT=2e7326aa903273485617f28cdf17dc06dfe44a87
+PACKAGES_GLUON_COMMUNITY_REPO=https://github.com/freifunk-gcp/v2015.1
+PACKAGES_GLUON_COMMUNITY_COMMIT=2e7326aa903273485617f28cdf17dc06dfe44a87
diff --git a/site.mk b/site.mk
index 04814ad..72171f4 100644
--- a/site.mk
+++ b/site.mk
@@ -9,7 +9,7 @@ GLUON_SITE_PACKAGES := \
 	gluon-config-mode-mesh-vpn \
 	gluon-config-mode-geo-location \
 	gluon-config-mode-contact-info \
-  gluon-config-mode-site-select \
+	gluon-config-mode-site-select \
 	gluon-ebtables-filter-multicast \
 	gluon-ebtables-filter-ra-dhcp \
 	gluon-luci-admin \
@@ -24,9 +24,9 @@ GLUON_SITE_PACKAGES := \
 	gluon-status-page \
 	iwinfo \
 	iptables \
-	haveged #\
-#	gluon-ebtables-filter-arp-ffmuc \
-#	gluon-ebtables-filter-multicast-ffmuc
+	haveged \
+	gluon-ebtables-filter-arp-ffmuc \
+	gluon-ebtables-filter-multicast-ffmuc
 
 
 DEFAULT_GLUON_RELEASE := snapshot~$(shell date '+%Y%m%d')