diff --git a/cloud-init-fix-unicode-handling-binarydecode.patch b/cloud-init-fix-unicode-handling-binarydecode.patch
new file mode 100644
index 0000000..32e2801
--- /dev/null
+++ b/cloud-init-fix-unicode-handling-binarydecode.patch
@@ -0,0 +1,11 @@
+--- cloudinit/util.py.orig
++++ cloudinit/util.py
+@@ -154,7 +154,7 @@ def target_path(target, path=None):
+ 
+ def decode_binary(blob, encoding='utf-8'):
+     # Converts a binary type into a text type using given encoding.
+-    if isinstance(blob, six.text_type):
++    if isinstance(blob, six.string_types):
+         return blob
+     return blob.decode(encoding)
+ 
diff --git a/cloud-init.changes b/cloud-init.changes
index 996652d..2eb16ef 100644
--- a/cloud-init.changes
+++ b/cloud-init.changes
@@ -1,7 +1,14 @@
+-------------------------------------------------------------------
+Thu Sep 15 13:01:35 UTC 2016 - rjschwei@suse.com
+
+- Decoding error (boo#998843)
+  + Added cloud-init-fix-unicode-handling-binarydecode.patch
+- Fix dependencies, depends on oauthlib instead of oauth
+
 -------------------------------------------------------------------
 Wed Sep 14 14:24:07 UTC 2016 - rjschwei@suse.com
 
-- Fix dataSourceOpenNebula.patch, missing closing paren
+- Fix dataSourceOpenNebula.patch, missing closing paren (boo#998836)
 
 -------------------------------------------------------------------
 Wed Sep 14 12:24:55 UTC 2016 - rjschwei@suse.com
diff --git a/cloud-init.spec b/cloud-init.spec
index f5e7910..3f562c7 100644
--- a/cloud-init.spec
+++ b/cloud-init.spec
@@ -44,6 +44,7 @@ Patch14:        cloud-init-finalbeforelogin.patch
 Patch20:        cloud-init-python2-sigpipe.patch
 Patch21:        cloud-init-net-eni.patch
 Patch22:        cloud-init-service.patch
+Patch23:        cloud-init-fix-unicode-handling-binarydecode.patch
 BuildRequires:  fdupes
 BuildRequires:  filesystem
 BuildRequires:  python-devel
@@ -61,11 +62,12 @@ Requires:       python-cheetah
 Requires:       python-configobj
 Requires:       python-Jinja2
 Requires:       python-jsonpatch
-Requires:       python-oauth
+Requires:       python-oauthlib
 Requires:       python-PrettyTable
 Requires:       python-pyserial
 Requires:       python-PyYAML
 Requires:       python-requests
+Requires:       python-setuptools
 Requires:       python-xml
 Requires:       sudo
 Requires:       util-linux
@@ -146,6 +148,7 @@ Unit tests for the cloud-init tools
 %patch20
 %patch21
 %patch22
+%patch23
 
 %if 0%{?suse_version} <= 1130
 # disable ecdsa for SLE 11 (not available)