diff --git a/config/defaults.erb b/config/defaults.erb
index 6b6bbd0..0164fcc 100644
--- a/config/defaults.erb
+++ b/config/defaults.erb
@@ -38,6 +38,7 @@ gluon_site_packages = %w(
 	iwinfo
 	iptables
 	haveged
+	ffho-ebtables-net-rules
 )
 
 gluon_ath10k_mesh = "11s"
diff --git a/template/modules.erb b/template/modules.erb
index 6416262..4810c9b 100644
--- a/template/modules.erb
+++ b/template/modules.erb
@@ -1,5 +1,8 @@
-GLUON_SITE_FEEDS='ffhh_packages'
+GLUON_SITE_FEEDS='ffhh_packages ffho_packages'
 
 PACKAGES_FFHH_PACKAGES_REPO=git://github.com/freifunkhamburg/ffhh-packages.git
 PACKAGES_FFHH_PACKAGES_COMMIT=ef9fcc1222f74c3c045b1450537a4b8b80efb56c
 
+PACKAGES_FFHO_PACKAGES_REPO=git://github.com/FreifunkHochstift/ffho-packages.git
+PACKAGES_FFHO_PACKAGES_COMMIT=72ba236324fb538dc304695285fae059489365b9
+PACKAGES_FFHO_PACKAGES_BRANCH=v2016.2.x