diff --git a/Makefile b/Makefile
index a1acfe0..6483c20 100644
--- a/Makefile
+++ b/Makefile
@@ -14,10 +14,10 @@ GLUON_TARGETS ?= \
 	mpc85xx-generic \
 	ramips-mt7621 \
 	ramips-rt305x \
- 	sunxi \
-	x86-kvm \
 	x86-64 \
-	x86-generic
+	x86-generic \
+	sunxi \
+	x86-kvm_guest 
 	
 
 GLUON_RELEASE := $(shell git describe --tags 2>/dev/null)
@@ -29,7 +29,7 @@ endif
 
 JOBS ?= $(shell cat /proc/cpuinfo | grep processor | wc -l)
 
-JOBS = 1
+#JOBS = 1
 
 GLUON_MAKE := ${MAKE} V=s BROKEN=0 -j ${JOBS} -C ${GLUON_BUILD_DIR} \
 			GLUON_RELEASE=${GLUON_RELEASE} \
diff --git a/modules b/modules
index 48fccea..919b321 100644
--- a/modules
+++ b/modules
@@ -1,4 +1,7 @@
-GLUON_SITE_FEEDS='ffrgb'
+GLUON_SITE_FEEDS='ffrgb ffhb'
 PACKAGES_FFRGB_REPO=https://github.com/ffrgb/gluon-packages.git
 PACKAGES_FFRGB_BRANCH=master
 PACKAGES_FFRGB_COMMIT=c9e25956356918d1e91f7e2b8fc716f8b07a789f
+
+PACKAGES_FFHB_REPO=git://github.com/FreifunkBremen/ffhb-packages.git
+PACKAGES_FFHB_COMMIT=8067f787e5272fd7b959be997fc420777bc46414
diff --git a/site.mk b/site.mk
index 72fe686..113429a 100644
--- a/site.mk
+++ b/site.mk
@@ -2,7 +2,6 @@ GLUON_SITE_PACKAGES := \
 	gluon-mesh-batman-adv-15 \
 	gluon-alfred \
 	gluon-respondd \
-	respondd-module-airtime \
 	gluon-autoupdater \
 	gluon-config-mode-core \
 	gluon-config-mode-autoupdater \
@@ -27,7 +26,8 @@ GLUON_SITE_PACKAGES := \
 	haveged \
 	gluon-ebtables-filter-arp-ffmuc \
 	gluon-ebtables-filter-multicast-ffmuc \
-	gluon-ssid-changer 
+	gluon-ssid-changer \
+	respondd-module-airtime 
 #	tecff-ath9k-broken-wifi-workaround
 #	gluon-config-mode-site-select