diff --git a/cloud-init-handle-not-implemented-query.patch b/cloud-init-handle-not-implemented-query.patch
new file mode 100644
index 0000000..133cff0
--- /dev/null
+++ b/cloud-init-handle-not-implemented-query.patch
@@ -0,0 +1,13 @@
+--- cloudinit/cmd/main.py.orig
++++ cloudinit/cmd/main.py
+@@ -681,6 +681,10 @@ def main(sysv_args=None):
+         rname, rdesc = ("dhclient-hook",
+                         "running dhclient-hook module")
+ 
++    elif name == 'query':
++        print 'Action query is not yet implemented'
++        sys.exit(1)
++
+     args.reporter = events.ReportEventStack(
+         rname, rdesc, reporting_enabled=report_on)
+ 
diff --git a/cloud-init.changes b/cloud-init.changes
index 4fdc38c..aeb6e51 100644
--- a/cloud-init.changes
+++ b/cloud-init.changes
@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Mon Feb 20 10:00:42 CET 2017 - kukuk@suse.de
+
+- Don't call insserv if we use systemd
+
+-------------------------------------------------------------------
+Thu Feb 16 20:56:03 UTC 2017 - rjschwei@suse.com
+
+- Do not set mount options for ephemeral drive, use the defaults
+  that are built into the code (bsc#930524)
+
+-------------------------------------------------------------------
+Thu Feb 16 19:39:16 UTC 2017 - rjschwei@suse.com
+
+- Update fix-default-systemd-unit-dir.patch (bsc#1024709)
+  + based on work by Thomas Abraham
+- Add cloud-init-handle-not-implemented-query.patch (boo#1017832)
+
 -------------------------------------------------------------------
 Mon Jan 23 20:52:03 CET 2017 - kukuk@suse.de
 
diff --git a/cloud-init.spec b/cloud-init.spec
index e3a3365..4babcbd 100644
--- a/cloud-init.spec
+++ b/cloud-init.spec
@@ -54,6 +54,7 @@ Patch26:        cloud-init-digital-ocean-datasource-enable-by-default.patch
 Patch27:        cloud-init-sysconfig-netpathfix.patch
 Patch28:        zypp_add_repos.diff
 Patch29:        datasourceLocalDisk.patch
+Patch30:        cloud-init-handle-not-implemented-query.patch
 BuildRequires:  fdupes
 BuildRequires:  filesystem
 BuildRequires:  python-devel
@@ -196,6 +197,7 @@ Unit tests for the cloud-init tools
 %patch27
 %patch28 -p0
 %patch29 -p0
+%patch30
 %if 0%{?suse_version} && 0%{?suse_version} <= 1210
 %patch40 -p1
 %endif
@@ -280,8 +282,10 @@ popd
 %fdupes %{buildroot}%{python_sitelib}
 %endif
 
+%if 0%{?suse_version} && 0%{?suse_version} <= 1210
 %postun
 %insserv_cleanup
+%endif
 
 %files
 %defattr(-,root,root)
diff --git a/cloud.cfg.suse b/cloud.cfg.suse
index 9bf76bf..904a0d4 100644
--- a/cloud.cfg.suse
+++ b/cloud.cfg.suse
@@ -6,7 +6,6 @@ users:
 disable_root: false
 preserve_hostname: false
 syslog_fix_perms: root:root
-mount_default_fields: [~, ~, 'auto', 'defaults', '0', '2']
 
 # The modules that run in the 'init' stage
 cloud_init_modules:
diff --git a/fix-default-systemd-unit-dir.patch b/fix-default-systemd-unit-dir.patch
index a6e6268..78822af 100644
--- a/fix-default-systemd-unit-dir.patch
+++ b/fix-default-systemd-unit-dir.patch
@@ -11,3 +11,14 @@
          }
      }
      cmd = ['pkg-config', '--variable=%s' % var, library]
+--- systemd/cloud-init-generator.orig
++++ systemd/cloud-init-generator
+@@ -7,7 +7,7 @@ LOG_D="/run/cloud-init"
+ ENABLE="enabled"
+ DISABLE="disabled"
+ RUN_ENABLED_FILE="$LOG_D/$ENABLE"
+-CLOUD_SYSTEM_TARGET="/lib/systemd/system/cloud-init.target"
++CLOUD_SYSTEM_TARGET="/usr/lib/systemd/system/cloud-init.target"
+ CLOUD_TARGET_NAME="cloud-init.target"
+ # lxc sets 'container', but lets make that explicitly a global
+ CONTAINER="${container}"