diff --git a/python-stomper.changes b/python-stomper.changes
index 33b7c29..0486061 100644
--- a/python-stomper.changes
+++ b/python-stomper.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Oct 24 11:15:20 UTC 2013 - speilicke@suse.com
+
+- Require python-setuptools instead of distribute (upstreams merged)
+
 -------------------------------------------------------------------
 Wed Mar 14 10:32:57 UTC 2012 - saschpe@suse.de
 
diff --git a/python-stomper.spec b/python-stomper.spec
index 730fbf1..c20a917 100644
--- a/python-stomper.spec
+++ b/python-stomper.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-stomper
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -11,21 +11,22 @@
 # case the license is the MIT License). An "Open Source License" is a
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
-#
+
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 Name:           python-stomper
 Version:        0.2.4
 Release:        0
-License:        Apache-2.0
 Summary:        This is a transport neutral client implementation of the STOMP protocol
-Url:            http://code.google.com/p/stomper
+License:        Apache-2.0
 Group:          Development/Languages/Python
+Url:            http://code.google.com/p/stomper
 Source:         http://pypi.python.org/packages/source/s/stomper/stomper-%{version}.tar.gz
 BuildRequires:  python-devel
-BuildRequires:  python-distribute
 BuildRequires:  python-nose
+BuildRequires:  python-setuptools
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if 0%{?suse_version} && 0%{?suse_version} <= 1110
 %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}