diff --git a/python-warlock.changes b/python-warlock.changes
index c97b914..e92d93a 100644
--- a/python-warlock.changes
+++ b/python-warlock.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Oct 24 11:16:53 UTC 2013 - speilicke@suse.com
+
+- Require python-setuptools instead of distribute (upstreams merged)
+
 -------------------------------------------------------------------
 Wed Jul  3 15:53:48 UTC 2013 - dmueller@suse.com
 
diff --git a/python-warlock.spec b/python-warlock.spec
index ff985bc..429b34e 100644
--- a/python-warlock.spec
+++ b/python-warlock.spec
@@ -25,10 +25,10 @@ Group:          Development/Languages/Python
 Url:            http://github.com/bcwaldon/warlock
 Source:         http://pypi.python.org/packages/source/w/warlock/warlock-%{version}.tar.gz
 BuildRequires:  python-devel
-BuildRequires:  python-distribute
 BuildRequires:  python-jsonpatch
 BuildRequires:  python-jsonschema
 BuildRequires:  python-nose
+BuildRequires:  python-setuptools
 Requires:       python-jsonpatch >= 0.7
 Requires:       python-jsonschema >= 0.10
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build