diff --git a/python-WSME.changes b/python-WSME.changes
index 908b0a9..ec3c955 100644
--- a/python-WSME.changes
+++ b/python-WSME.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Sep  2 16:29:37 UTC 2013 - dmueller@suse.com
+
+- add six-14-support.diff:
+  * Add support for Six 1.4+
+
 -------------------------------------------------------------------
 Mon Apr 29 11:27:37 UTC 2013 - dmueller@suse.com
 
diff --git a/python-WSME.spec b/python-WSME.spec
index 96a9319..f66962c 100644
--- a/python-WSME.spec
+++ b/python-WSME.spec
@@ -24,6 +24,7 @@ License:        MIT
 Group:          Development/Languages/Python
 Url:            http://packages.python.org/WSME/
 Source:         http://pypi.python.org/packages/source/W/WSME/WSME-%{version}.tar.gz
+Patch0:         six-14-support.diff
 BuildRequires:  python-WebOb
 BuildRequires:  python-d2to1
 BuildRequires:  python-devel
@@ -48,6 +49,7 @@ with focus on extensibility, framework-independance and better type handling.
 
 %prep
 %setup -q -n WSME-%{version}
+%patch0
 
 %build
 python setup.py build
diff --git a/six-14-support.diff b/six-14-support.diff
new file mode 100644
index 0000000..f638bc8
--- /dev/null
+++ b/six-14-support.diff
@@ -0,0 +1,17 @@
+--- wsme/types.py
++++ wsme/types.py
+@@ -573,12 +573,12 @@
+ 
+ class BaseMeta(type):
+     def __new__(cls, name, bases, dct):
+-        if bases[0] is not object and '__registry__' not in dct:
++        if bases and bases[0] is not object and '__registry__' not in dct:
+             dct['__registry__'] = registry
+         return type.__new__(cls, name, bases, dct)
+ 
+     def __init__(cls, name, bases, dct):
+-        if bases[0] is not object:
++        if bases and bases[0] is not object:
+             cls.__registry__.register(cls)
+ 
+