diff --git a/README.md b/README.md
index c8b9e2b..0c21af3 100755
--- 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/00-packages/00-run-chroot.sh b/stage2/00-packages/00-run-chroot.sh
new file mode 100755
index 0000000..ccea43e
--- /dev/null
+++ b/stage2/00-packages/00-run-chroot.sh
@@ -0,0 +1,3 @@
+echo -e "\n## nymea repo\ndeb http://repository.nymea.io stretch main\n#deb-src http://repository.nymea.io stretch main" | tee /etc/apt/sources.list.d/nymea.list
+wget -qO - http://repository.nymea.io/repository-pubkey.gpg | apt-key add -
+apt-get update
diff --git a/stage2/00-packages/01-packages b/stage2/00-packages/01-packages
new file mode 100644
index 0000000..9659eb1
--- /dev/null
+++ b/stage2/00-packages/01-packages
@@ -0,0 +1 @@
+nymea-networkmanager
diff --git a/stage2/02-net-tweaks/00-packages b/stage2/02-net-tweaks/00-packages
index cc4a68e..e68a16a 100644
--- a/stage2/02-net-tweaks/00-packages
+++ b/stage2/02-net-tweaks/00-packages
@@ -1,4 +1,4 @@
 wpasupplicant wireless-tools firmware-atheros firmware-brcm80211 firmware-libertas firmware-misc-nonfree firmware-realtek
 raspberrypi-net-mods
-dhcpcd5
 net-tools
+network-manager
diff --git a/stage2/02-net-tweaks/01-run-chroot.sh b/stage2/02-net-tweaks/01-run-chroot.sh
new file mode 100644
index 0000000..71df823
--- /dev/null
+++ b/stage2/02-net-tweaks/01-run-chroot.sh
@@ -0,0 +1,4 @@
+#!/bin/bash -e
+
+systemctl enable ssh
+systemctl disable dhcpcd5
diff --git a/stage2/02-net-tweaks/01-run.sh b/stage2/02-net-tweaks/01-run.sh
index d21419e..86c6b3e 100755
--- a/stage2/02-net-tweaks/01-run.sh
+++ b/stage2/02-net-tweaks/01-run.sh
@@ -1,8 +1,6 @@
 #!/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/"
 
+sed -i 's/-a nymea -p nymea-box/-a "Raspberry Pi" -p "Raspberry Pi"/' ${ROOTFS_DIR}/lib/systemd/system/nymea-networkmanager.service