diff --git a/bsp/default/root_file_system/etc/config/alfred b/bsp/default/root_file_system/etc/config/alfred
deleted file mode 100644
index 5fd42590ebb3a15138445f8bdce8a9960be39027..0000000000000000000000000000000000000000
--- a/bsp/default/root_file_system/etc/config/alfred
+++ /dev/null
@@ -1,6 +0,0 @@
-config 'alfred' 'alfred'
-    option interface 'br-mesh'
-    option mode 'slave'
-    option batmanif 'bat0'
-    option start_vis '0'
-    option run_facters '0'
diff --git a/src/packages/fff/fff-alfred/Makefile b/src/packages/fff/fff-alfred/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..2c3140cc048e247040e841d6966b6d2de6b0b4b0
--- /dev/null
+++ b/src/packages/fff/fff-alfred/Makefile
@@ -0,0 +1,40 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=fff-alfred
+PKG_VERSION:=1
+PKG_RELEASE:=1
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/$(PKG_NAME)
+    SECTION:=base
+    CATEGORY:=Freifunk
+    TITLE:=Freifunk-Franken Alfred
+    URL:=http://www.freifunk-franken.de
+    DEPENDS:=+alfred
+endef
+
+define Package/$(PKG_NAME)/description
+    This is the Freifunk Franken Firmware Alfred package.
+    This packages configures the Alfred on the device.
+endef
+
+define Build/Prepare
+    echo "all: " > $(PKG_BUILD_DIR)/Makefile
+endef
+
+define Build/Configure
+    # nothing
+endef
+
+define Build/Compile
+    # nothing
+endef
+
+define Package/$(PKG_NAME)/install
+    $(CP) ./files/* $(1)/
+endef
+
+$(eval $(call BuildPackage,$(PKG_NAME)))
diff --git a/src/packages/fff/fff-alfred/files/etc/uci-defaults/51-fff-alfred b/src/packages/fff/fff-alfred/files/etc/uci-defaults/51-fff-alfred
new file mode 100644
index 0000000000000000000000000000000000000000..e09281ecdadde221fc936b1e15ac6efd47630eb8
--- /dev/null
+++ b/src/packages/fff/fff-alfred/files/etc/uci-defaults/51-fff-alfred
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+>/etc/config/alfred
+
+uci batch <<EOF
+  set alfred.alfred=alfred
+  set alfred.alfred.interface='br-mesh'
+  set alfred.alfred.mode='slave'
+  set alfred.alfred.batmanif='bat0'
+  set alfred.alfred.start_vis='0'
+  set alfred.alfred.run_facters='0'
+EOF
diff --git a/src/packages/fff/fff-nodewatcher/Makefile b/src/packages/fff/fff-nodewatcher/Makefile
index 79cb917a33078595392b1f3a1e15a44c2c2e4add..bdceffd3e4ad47762abbd53201b14942b30b63aa 100644
--- a/src/packages/fff/fff-nodewatcher/Makefile
+++ b/src/packages/fff/fff-nodewatcher/Makefile
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fff-nodewatcher
 PKG_VERSION:=41
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
 
@@ -13,7 +13,7 @@ define Package/$(PKG_NAME)
     CATEGORY:=Freifunk
     TITLE:= Freifunk-Franken Nodewatcher
     URL:=http://www.freifunk-franken.de
-    DEPENDS:=+alfred +micrond +fff-random +ip +ip-bridge
+    DEPENDS:=+fff-alfred +micrond +fff-random +ip +ip-bridge
 endef
 
 define Package/$(PKG_NAME)/description