diff --git a/uid_wrapper.changes b/uid_wrapper.changes
index 44146dc..9c7369b 100644
--- a/uid_wrapper.changes
+++ b/uid_wrapper.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon May 11 08:35:22 CEST 2015 - asn@cryptomilk.org
+
+- Cleanup specfile
+
 -------------------------------------------------------------------
 Wed Jan 21 12:48:00 UTC 2015 - asn@cryptomilk.org
 
diff --git a/uid_wrapper.spec b/uid_wrapper.spec
index 55e5d57..a635fd4 100644
--- a/uid_wrapper.spec
+++ b/uid_wrapper.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package uid_wrapper
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,6 +15,12 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+############################# NOTE ##################################
+#
+# This is a special library. You are not able to link this library.
+# Do NOT create library package or a devel package!
+#
+############################# NOTE ##################################
 
 Name:           uid_wrapper
 Version:        1.1.0
@@ -29,6 +35,10 @@ Source0:        https://ftp.samba.org/pub/cwrap/%{name}-%{version}.tar.gz
 
 BuildRequires:  cmake
 BuildRequires:  libcmocka-devel
+BuildRequires:  pkg-config
+
+Requires:       pkg-config
+Requires:       cmake
 
 %description
 Some projects like a file server need privilege separation to be able to switch
@@ -50,20 +60,18 @@ development/testing.
 %build
 # CMAKE_SKIP_RPATH:BOOL=OFF is need to run the tests!
 %cmake \
-  -DCMAKE_SKIP_RPATH:BOOL=OFF \
-  -DUNIT_TESTING=ON \
-  %{_builddir}/%{name}-%{version}
+  -DUNIT_TESTING=ON
 
-%__make %{?jobs:-j%jobs} VERBOSE=1
+make %{?_smp_mflags} VERBOSE=1
 
 %install
 pushd build
-%makeinstall
+%cmake_install
 popd
 
 %check
 pushd build
-%__make test
+make %{?_smp_mflags} test || cat $(find Testing -name "*.log")
 popd
 
 %post -p /sbin/ldconfig