diff --git a/02_ignition_firstboot b/02_ignition_firstboot
index c3b9a20..952f3e9 100644
--- a/02_ignition_firstboot
+++ b/02_ignition_firstboot
@@ -8,8 +8,8 @@ set flagpath="/boot/writable"
 # to be used later on the kernel command line.
 set ignition_firstboot=""
 if ! [ -f "${flagpath}/firstboot_happened" ]; then
-    # default to dhcp networking parameters to be used with ignition 
-    set ignition_network_kcmdline='rd.neednet=1 ip=dhcp'
+    # This defaults to DHCP in dracut
+    set ignition_network_kcmdline=''
 
     # source in the `ignition.firstboot` file which could override the
     # above $ignition_network_kcmdline with static networking config.
diff --git a/ignition-enable-network.sh b/ignition-enable-network.sh
index 4d9c5b3..3956cc7 100644
--- a/ignition-enable-network.sh
+++ b/ignition-enable-network.sh
@@ -3,7 +3,7 @@
 . /lib/dracut-lib.sh
 
 if [ -f /run/ignition/neednet ] && ! getargbool 0 'rd.neednet'; then
-    echo "rd.neednet=1 ip=dhcp" > /etc/cmdline.d/40-ignition-neednet.conf
+    echo "rd.neednet=1" > /etc/cmdline.d/40-ignition-neednet.conf
 
     # Re-trigger generation of network rules
     . /lib/dracut/hooks/pre-udev/60-net-genrules.sh
diff --git a/ignition.changes b/ignition.changes
index 9744167..6b13da8 100644
--- a/ignition.changes
+++ b/ignition.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Sep  4 12:07:21 UTC 2020 - Fabian Vogt <fvogt@suse.com>
+
+- 02_ignition_firstboot, ignition-enable-network.sh: Drop ip=dhcp,
+  it's the default anyway and avoids a delay on boot (boo#1173402)
+- 02_ignition_firstboot: Drop rd.neednet=1, both ignition and
+  combustion enable it themselves when necessary
+
 -------------------------------------------------------------------
 Thu Sep  3 15:04:30 UTC 2020 - Ignaz Forster <iforster@suse.com>