diff --git a/cloud-init-no-dmidecode-on-ppc64.patch b/cloud-init-no-dmidecode-on-ppc64.patch
index 5b48dcd..7509f59 100644
--- a/cloud-init-no-dmidecode-on-ppc64.patch
+++ b/cloud-init-no-dmidecode-on-ppc64.patch
@@ -20,7 +20,7 @@ Index: cloud-init-0.7.5/cloudinit/sources/DataSourceSmartOS.py
  
          uname_arch = os.uname()[4]
 -        if uname_arch.startswith("arm") or uname_arch == "aarch64":
-+        if uname_arch.startswith("arm") or uname_arch == "aarch64" uname_arch.startswith("ppc"):
++        if uname_arch.startswith("arm") or uname_arch == "aarch64" or uname_arch.startswith("ppc"):
              # Disabling because dmidcode in dmi_data() crashes kvm process
              LOG.debug("Disabling SmartOS datasource on arm (LP: #1243287)")
              return False
diff --git a/cloud-init-no-user-lock-if-already-locked.patch b/cloud-init-no-user-lock-if-already-locked.patch
new file mode 100644
index 0000000..176fc60
--- /dev/null
+++ b/cloud-init-no-user-lock-if-already-locked.patch
@@ -0,0 +1,16 @@
+--- cloud-init-0.7.5/cloudinit/distros/__init__.py.orig	2014-09-16 11:00:52.192149797 +0200
++++ cloud-init-0.7.5/cloudinit/distros/__init__.py	2014-09-16 11:02:02.272874250 +0200
+@@ -402,8 +402,11 @@
+             # about long names.
+             util.subp(['passwd', '-l', name])
+         except Exception as e:
+-            util.logexc(LOG, 'Failed to disable password for user %s', name)
+-            raise e
++            if e.exit_code != 3:
++                util.logexc(LOG, 'Failed to disable password for user %s', name)
++                raise e
++            else:
++                util.logexc(LOG, 'Password access already locked for user %s', name)
+ 
+     def set_passwd(self, user, passwd, hashed=False):
+         pass_string = '%s:%s' % (user, passwd)
diff --git a/cloud-init.changes b/cloud-init.changes
index 4a12995..dc0ecb7 100644
--- a/cloud-init.changes
+++ b/cloud-init.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Mon Nov 21 12:04:28 UTC 2014 - reik.keutterling@nodefall.de
+
+- fixed syntax error in dmidecode on ppc64 patch
+
+-------------------------------------------------------------------
+Tue Sep 16 11:09:01 CEST 2014 - ms@suse.de
+
+- users-groups module checks if the account is locked by
+  calling 'passwd -l' which is ok but it should not raise
+  if the account is already locked. This patch will cause
+  lock_passwd to raise only if the account locking failed
+  cloud-init-no-user-lock-if-already-locked.patch
+
 -------------------------------------------------------------------
 Sat Aug  9 12:35:16 UTC 2014 - dvlaeev@suse.com
 
diff --git a/cloud-init.spec b/cloud-init.spec
index 72ad1c8..57142d7 100644
--- a/cloud-init.spec
+++ b/cloud-init.spec
@@ -39,6 +39,7 @@ Patch6:         dynamicInitCmd.diff
 Patch7:         suseSetInitCmd.patch
 Patch8:         cloudinit-datasources.patch
 Patch9:         cloud-init-no-dmidecode-on-ppc64.patch
+Patch10:        cloud-init-no-user-lock-if-already-locked.patch
 BuildRequires:  fdupes
 BuildRequires:  filesystem
 BuildRequires:  python-devel
@@ -131,6 +132,7 @@ Unit tests for the cloud-init tools
 %patch7
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
 
 %if 0%{?suse_version} <= 1130
 # disable ecdsa for SLE 11 (not available)