diff --git a/cloud-init.changes b/cloud-init.changes
index 3b274a1..eb7da5d 100644
--- a/cloud-init.changes
+++ b/cloud-init.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Sep 20 10:11:42 UTC 2017 - dmueller@suse.com
+
+- add skip-argparse-on-python3.patch: don't depend on argparse
+  for python3, it is builtin there (as of python 3.2, so the
+  patch should be good enough)
+
 -------------------------------------------------------------------
 Mon Sep 18 09:39:26 CEST 2017 - kukuk@suse.de
 
diff --git a/cloud-init.spec b/cloud-init.spec
index f4527ab..08e062d 100644
--- a/cloud-init.spec
+++ b/cloud-init.spec
@@ -57,6 +57,7 @@ Patch29:        datasourceLocalDisk.patch
 Patch30:        cloud-init-handle-not-implemented-query.patch
 Patch32:        cloud-init-net-sysconfig-lp1665441.patch
 Patch33:        cloud-init-spceandtabs-clean.patch
+Patch34:        skip-argparse-on-python3.patch
 BuildRequires:  fdupes
 BuildRequires:  filesystem
 %if 0%{?suse_version} && 0%{?suse_version} > 1315
@@ -223,6 +224,7 @@ Unit tests for the cloud-init tools
 %patch30
 %patch32 -p1
 %patch33 -p1
+%patch34
 %if 0%{?suse_version} && 0%{?suse_version} <= 1210
 %patch40 -p1
 %endif
diff --git a/skip-argparse-on-python3.patch b/skip-argparse-on-python3.patch
new file mode 100644
index 0000000..f07b41c
--- /dev/null
+++ b/skip-argparse-on-python3.patch
@@ -0,0 +1,23 @@
+--- requirements.txt
++++ requirements.txt
+@@ -27,9 +27,6 @@
+ # All new style configurations are in the yaml format
+ pyyaml
+ 
+-# The new main entrypoint uses argparse instead of optparse
+-argparse
+-
+ # Requests handles ssl correctly!
+ requests
+ 
+--- setup.py
++++ setup.py
+@@ -198,7 +198,7 @@
+ 
+ requirements = read_requires()
+ if sys.version_info < (3,):
+-    requirements.append('cheetah')
++    requirements.append('cheetah', 'argparse')
+ 
+ setuptools.setup(
+     name='cloud-init',