diff --git a/device/device-raspberry-pi/APKBUILD b/device/device-raspberry-pi/APKBUILD
index 12faf5639..30cc2e0cd 100644
--- a/device/device-raspberry-pi/APKBUILD
+++ b/device/device-raspberry-pi/APKBUILD
@@ -2,7 +2,7 @@
 pkgname="device-raspberry-pi"
 pkgdesc="Raspberry Pi"
 pkgver=0.1
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="noarch"
@@ -49,7 +49,7 @@ nonfree_firmware() {
 	mkdir "$subpkgdir"
 }
 
-sha512sums="e8243fb5a7e6f47ee48d6eba80a17aba294810bbae985145e7beb5f93d73c8221daa491edfebd908ee0dced635f5ed7d87b652e2e061910bea327b46ec3b3527  deviceinfo
+sha512sums="1ddb6af2598a9990f8b7348d8dfff40c46cc40a254b2a42ac47889e6c6e9af9b7639067cabfbecf66bc05c4d6e9543335caa10ac391a19a345da4a9731683e74  deviceinfo
 de4d6967be7f68d0b005ab968e6f8da2eacf4ba2d814d1f47ed6ad43ba81cacc1fdc74b3ba3a44b5ae6f08c51b53708432afb5779422b977b65ae69a5a4bf068  config.txt
 e94c810f973eb6b6d0fb3687ea1d70612ba00e9c5d6b3608390a161e077c5591fd9d232c37b42443c05ed28bb639ca1754422ff35899c5e33d7fc266e0e1ad05  usercfg.txt
 ae3de0b8fec07d3a283dc3c06bf8678eec1e65c9faf0b7f4fdc9fb92751e324d1f8e2fb224dbbf561b7e5a6fb34769bfa1657858375f74b101a130d78e0737e2  cmdline.txt
diff --git a/device/device-raspberry-pi/deviceinfo b/device/device-raspberry-pi/deviceinfo
index 5bae90ed4..d741d6a44 100644
--- a/device/device-raspberry-pi/deviceinfo
+++ b/device/device-raspberry-pi/deviceinfo
@@ -8,6 +8,7 @@ deviceinfo_date=""
 deviceinfo_dtb=""
 deviceinfo_modules_initfs=""
 deviceinfo_arch="armhf"
+deviceinfo_disable_dhcpd="true"
 
 # Device related
 deviceinfo_keyboard="true"
diff --git a/main/postmarketos-mkinitfs/APKBUILD b/main/postmarketos-mkinitfs/APKBUILD
index 1e9094823..472da5f6f 100644
--- a/main/postmarketos-mkinitfs/APKBUILD
+++ b/main/postmarketos-mkinitfs/APKBUILD
@@ -1,6 +1,6 @@
 pkgname=postmarketos-mkinitfs
 pkgver=0.6.6
-pkgrel=0
+pkgrel=1
 pkgdesc="Tool to generate initramfs images for postmarketOS"
 url="https://github.com/postmarketOS"
 # multipath-tools: kpartx
@@ -24,5 +24,5 @@ package() {
 	mkdir -p "$pkgdir/etc/postmarketos-mkinitfs/hooks/"
 }
 sha512sums="d5abfe9a1298069e6722555c6e16223b09b36af65d879feb64d540aa6cbc009a3aa7f00528bcf656370ec37cc64f925c72ebb77813961cd6ebf22107b57ea029  init.sh.in
-1e39c077932ac3e1f068c1c438b22339b6d705f1358897fe738e64e2280e36346b6a65f0e50996e9a99b182c617d96995adc9263643afa5f46b4b93857fe73d6  init_functions.sh
+dfd07a3ac1aa8a2bd999b5e06cbba12f44675989cdd54da8e5a0b27740d21d66a0543887bd15b4b2359a84fe980d65fc954e3494cfe1043b33094c30a0bb082e  init_functions.sh
 3ecdf70c61fa862990b3afbec872f0498e0246017502aa22106782f8c5ef361902ad05473d6c2121db359f4f1d7e7a83da322e0d9f243825c4d1144358447164  mkinitfs.sh"
diff --git a/main/postmarketos-mkinitfs/init_functions.sh b/main/postmarketos-mkinitfs/init_functions.sh
index 9e2e0ce14..909a6b45e 100644
--- a/main/postmarketos-mkinitfs/init_functions.sh
+++ b/main/postmarketos-mkinitfs/init_functions.sh
@@ -241,6 +241,14 @@ start_udhcpd() {
 	# Only run once
 	[ -e /etc/udhcpd.conf ] && return
 
+	# Skip if disabled
+	# shellcheck disable=SC2154
+	if [ "$deviceinfo_disable_dhcpd" = "true" ]; then
+		echo "NOTE: start of dhcpd is disabled (deviceinfo_disable_dhcpd)"
+		touch /etc/udhcpcd.conf
+		return
+	fi
+
 	# Get usb interface
 	INTERFACE=""
 	ifconfig rndis0 "$IP" && INTERFACE=rndis0