diff --git a/cloud-init.changes b/cloud-init.changes
index da09d15..7e8fd8f 100644
--- a/cloud-init.changes
+++ b/cloud-init.changes
@@ -1,7 +1,17 @@
+-------------------------------------------------------------------
+Wed May 16 15:21:33 UTC 2018 - rjschwei@suse.com
+
+- Drop the generator (bsc#1089824, boo#1093501)
+  + The generator spawns a script called ds-identify which in turn calls
+    blkid. When the generator executes the environment may or may not be
+    ready. The generator speeds up the boot process in cases where
+    cloud-init is enabled but we are not in an environment where cloud-init
+    should run -> Don't do that.
+
 -------------------------------------------------------------------
 Fri May 11 14:20:28 UTC 2018 - rjschwei@suse.com
 
-- Update to version 18.1 (bsc#1092637, bsc#1084509)
+- Update to version 18.2 (bsc#1092637, bsc#1084509)
   + Forward port cloud-init-python2-sigpipe.patch
   + Forward port cloud-init-no-python-linux-dist.patch
   + Add cloud-init-no-trace-empt-sect.patch
diff --git a/cloud-init.spec b/cloud-init.spec
index 2584be5..289be0b 100644
--- a/cloud-init.spec
+++ b/cloud-init.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cloud-init
 #
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -261,6 +261,9 @@ rm %{buildroot}/%{_sysconfdir}/cloud/templates/*.debian.*
 rm %{buildroot}/%{_sysconfdir}/cloud/templates/*.redhat.*
 rm %{buildroot}/%{_sysconfdir}/cloud/templates/*.ubuntu.*
 
+# Remove the systemd generator (bsc#1089824, boo#1093501)
+rm -rf %{buildroot}/%{systemd_prefix}/systemd/system-generators/cloud-init-generator
+
 # move sysvinit scripts into the "right" place
 %if 0%{?suse_version} && 0%{?suse_version} <= 1210
 mkdir -p %{buildroot}/%{_initddir}
@@ -315,7 +318,6 @@ popd
 %attr(0755, root, root) %{_initddir}/cloud-init-local
 %attr(0755, root, root) %{_initddir}/cloud-final
 %else
-%{systemd_prefix}/systemd/system-generators/cloud-init-generator
 %{systemd_prefix}/systemd/system/cloud-config.service
 %{systemd_prefix}/systemd/system/cloud-config.target
 %{systemd_prefix}/systemd/system/cloud-init-local.service