diff --git a/_service b/_service
deleted file mode 100644
index 5806d87..0000000
--- a/_service
+++ /dev/null
@@ -1,4 +0,0 @@
-<services>
-  <service name="download_files" mode="localonly">
-  </service>
-</services>
diff --git a/zeromq.changes b/zeromq.changes
index 4f45cfd..2e8901a 100644
--- a/zeromq.changes
+++ b/zeromq.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon May 12 09:23:17 UTC 2014 - tchvatal@suse.com
+
+- Cleanup to remove SLE10 and older mentions
+- Remove other distros from rules as we don't build for them anyway.
+- Cleanup with spec-cleaner.
+- Enable tests.
+
 -------------------------------------------------------------------
 Thu Mar 27 13:42:35 UTC 2014 - speilicke@suse.com
 
diff --git a/zeromq.spec b/zeromq.spec
index 2414ebd..8ceeb07 100644
--- a/zeromq.spec
+++ b/zeromq.spec
@@ -16,35 +16,21 @@
 #
 
 
+%define lib_name libzmq3
+%ifarch %ix86 x86_64
+%define with_pgm 1
+%endif
 Name:           zeromq
 Version:        4.0.4
 Release:        0
-Url:            http://www.zeromq.org/
 Summary:        Lightweight messaging kernel
 License:        LGPL-3.0+
 Group:          Productivity/Networking/Web/Servers
+Url:            http://www.zeromq.org/
 Source:         http://download.zeromq.org/%{name}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%ifarch %ix86 x86_64
-%if 0%{?suse_version} >= 1100
-%define with_pgm 1
-%endif
-%endif
 BuildRequires:  gcc-c++
-%if 0%{?suse_version} && 0%{?suse_version} < 1100
-BuildRequires:  e2fsprogs-devel
-%else
-%if 0%{?rhel} || 0%{?centos_version}
-BuildRequires:  e2fsprogs-devel
 BuildRequires:  libuuid-devel
-%else
-%if 0%{?mdkversion} && 0%{?mdkversion} < 201000
-BuildRequires:  e2fsprogs-devel
-%else
-BuildRequires:  libuuid-devel
-%endif
-%endif
-%endif
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if 0%{?with_pgm}
 BuildRequires:  pkgconfig
 BuildRequires:  python
@@ -63,8 +49,6 @@ abstraction of asynchronous message queues, multiple messaging patterns,
 message filtering (subscriptions), seamless access to multiple transport
 protocols and more.
 
-%define lib_name libzmq3
-
 %package -n %{lib_name}
 Summary:        Shared Library for ZeroMQ
 Group:          Productivity/Networking/Web/Servers
@@ -99,22 +83,23 @@ This package holds the development files for ZeroMQ.
 %setup -q
 
 %build
-%if 0%{?with_pgm} && 0%{?sles_version} == 9
-export PKG_CONFIG_PATH="/opt/gnome/%{_lib}/pkgconfig:$PKG_CONFIG_PATH"
-%endif
 %configure \
+  --disable-silent-rules \
 %if 0%{?with_pgm}
   --with-pgm \
 %endif
   --disable-static \
   --with-pic
-make %{?_smp_mflags} V=1
+make %{?_smp_mflags}
 
 %install
-%makeinstall V=1
-find %{buildroot} -name "*.la" -delete
+make DESTDIR=%{buildroot} install %{?_smp_mflags}
+find %{buildroot} -type f -name "*.la" -delete -print
 
-%post   -n %{lib_name} -p /sbin/ldconfig
+%check
+make check %{?_smp_mflags}
+
+%post -n %{lib_name} -p /sbin/ldconfig
 
 %postun -n %{lib_name} -p /sbin/ldconfig
 
@@ -122,7 +107,7 @@ find %{buildroot} -name "*.la" -delete
 %defattr(-,root,root,-)
 %doc COPYING COPYING.LESSER
 %{_libdir}/libzmq.so.*
-%{_bindir}/curve_keygen 
+%{_bindir}/curve_keygen
 
 %files devel
 %defattr(-,root,root,-)