diff --git a/README.md b/README.md
index 15affd0..f6cf4ec 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,12 @@
 # pi-gen
 
-_Tool used to create the raspberrypi.org Raspbian images_
+_Tool used to create the berrylan.app Raspbian images_
 
+This tool is based on the pi-gen tool of the raspberrypi.org Raspbian images.
+It only adds http://repository.nymea.io to the repositories and preinstalls
+nymea-networkmanager in the image to allow WiFi configuration via BerryLan.
+
+nymea-networkmanager can be found at https://github.com/guh/nymea-networkmanager
 
 ## Dependencies
 
diff --git a/stage2/02-net-tweaks/00-packages b/stage2/02-net-tweaks/00-packages
index cc4a68e..d6f7323 100644
--- a/stage2/02-net-tweaks/00-packages
+++ b/stage2/02-net-tweaks/00-packages
@@ -1,4 +1,3 @@
 wpasupplicant wireless-tools firmware-atheros firmware-brcm80211 firmware-libertas firmware-misc-nonfree firmware-realtek
 raspberrypi-net-mods
-dhcpcd5
 net-tools
diff --git a/stage2/02-net-tweaks/01-run.sh b/stage2/02-net-tweaks/01-run.sh
index 3ba2ef9..59e789c 100755
--- a/stage2/02-net-tweaks/01-run.sh
+++ b/stage2/02-net-tweaks/01-run.sh
@@ -1,8 +1,5 @@
 #!/bin/bash -e
 
-install -v -d					"${ROOTFS_DIR}/etc/systemd/system/dhcpcd.service.d"
-install -v -m 644 files/wait.conf		"${ROOTFS_DIR}/etc/systemd/system/dhcpcd.service.d/"
-
 install -v -d					"${ROOTFS_DIR}/etc/wpa_supplicant"
 install -v -m 600 files/wpa_supplicant.conf	"${ROOTFS_DIR}/etc/wpa_supplicant/"
 
diff --git a/stage2/04-berrylan/00-run-chroot.sh b/stage2/04-berrylan/00-run-chroot.sh
new file mode 100755
index 0000000..bbf37b5
--- /dev/null
+++ b/stage2/04-berrylan/00-run-chroot.sh
@@ -0,0 +1,20 @@
+# Add nymea repository
+echo -e "\n## nymea repo\ndeb http://repository.nymea.io stretch main raspbian\n#deb-src http://repository.nymea.io stretch main raspbian" | tee /etc/apt/sources.list.d/nymea.list
+wget -qO - http://repository.nymea.io/repository-pubkey.gpg | apt-key add -
+
+# Set repository priority (prefere packages from raspbian section
+cat <<EOM >/etc/apt/preferences.d/nymea
+Package: *
+Pin: release c=raspbian
+Pin-Priority: 700
+
+Package: *
+Pin: origin repository.nymea.io c=main
+Pin-Priority: 500
+EOM
+
+apt-get update
+#!/bin/bash -e
+
+systemctl enable ssh
+systemctl disable dhcpcd5
diff --git a/stage2/04-berrylan/01-packages b/stage2/04-berrylan/01-packages
new file mode 100644
index 0000000..961e9b9
--- /dev/null
+++ b/stage2/04-berrylan/01-packages
@@ -0,0 +1,2 @@
+network-manager
+nymea-networkmanager
diff --git a/stage2/04-berrylan/01-run-chroot.sh b/stage2/04-berrylan/01-run-chroot.sh
new file mode 100644
index 0000000..71df823
--- /dev/null
+++ b/stage2/04-berrylan/01-run-chroot.sh
@@ -0,0 +1,4 @@
+#!/bin/bash -e
+
+systemctl enable ssh
+systemctl disable dhcpcd5
diff --git a/stage2/04-berrylan/04-run.sh b/stage2/04-berrylan/04-run.sh
new file mode 100644
index 0000000..32fbe8d
--- /dev/null
+++ b/stage2/04-berrylan/04-run.sh
@@ -0,0 +1,3 @@
+sed -i 's/-a nymea -p nymea-box/-a "Raspberry Pi" -p "Raspberry Pi"/' ${ROOTFS_DIR}/lib/systemd/system/nymea-networkmanager.service
+
+