diff --git a/keyutils.changes b/keyutils.changes
index 6436450..fe8625c 100644
--- a/keyutils.changes
+++ b/keyutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jul 29 08:37:36 UTC 2013 - tchvatal@suse.com
+
+- Use macros bit more and fix noreplace on folder, which is not
+  good.
+
 -------------------------------------------------------------------
 Sun Jun 16 16:59:30 UTC 2013 - lmuelle@suse.com
 
diff --git a/keyutils.spec b/keyutils.spec
index 6efaaa9..cd85704 100644
--- a/keyutils.spec
+++ b/keyutils.spec
@@ -60,10 +60,10 @@ This package provides headers and libraries for building key utilities.
 %patch3 -p1
 
 %build
-make %{?_smp_mflags} NO_ARLIB=1 CFLAGS="$RPM_OPT_FLAGS" CC="%__cc"
+make %{?_smp_mflags} NO_ARLIB=1 CFLAGS="%{optflags}" CC="%__cc"
 
 %install
-make install NO_ARLIB=1 DESTDIR=$RPM_BUILD_ROOT LIBDIR=/%_lib USRLIBDIR=/usr/%_lib
+make install NO_ARLIB=1 DESTDIR=%{buildroot} LIBDIR=/%{_lib} USRLIBDIR=%{_libdir}
 
 %post -n %lname -p /sbin/ldconfig 
 
@@ -74,10 +74,10 @@ make install NO_ARLIB=1 DESTDIR=$RPM_BUILD_ROOT LIBDIR=/%_lib USRLIBDIR=/usr/%_l
 %doc README LICENCE.GPL
 /sbin/*
 /bin/*
-/usr/share/keyutils
+%{_datadir}/keyutils
 %{_mandir}/*/*
-%config(noreplace) /etc/*
-%dir /etc/request-key.d/
+%config(noreplace) %{_sysconfdir}/request-key.conf
+%dir %{_sysconfdir}/request-key.d/
 
 %files -n %lname
 %defattr(-,root,root,-)
@@ -86,7 +86,7 @@ make install NO_ARLIB=1 DESTDIR=$RPM_BUILD_ROOT LIBDIR=/%_lib USRLIBDIR=/usr/%_l
 
 %files devel
 %defattr(-,root,root,-)
-/usr/%{_lib}/libkeyutils.so
+%{_libdir}/libkeyutils.so
 %{_includedir}/*
 
 %changelog