diff --git a/syslog-ng.spec b/syslog-ng.spec
index 26b8abb..768884c 100644
--- a/syslog-ng.spec
+++ b/syslog-ng.spec
@@ -1,11 +1,8 @@
 %global evtlog_ver 0.2.12
 
-%global _sbindir /sbin
-%global _libdir /%{_lib}
-
 Name: syslog-ng
 Version: 3.2.5
-Release: 8%{?dist}
+Release: 9%{?dist}
 Summary: Next-generation syslog server
 
 Group: System Environment/Daemons
@@ -101,13 +98,13 @@ developing applications that use %{name}.
 
 %build
 %configure \
-    --prefix=/ \
-    --libdir=/%{_lib} \
+    --prefix=%{_prefix} \
+    --libdir=%{_libdir} \
     --includedir=%{_includedir} \
     --sysconfdir=%{_sysconfdir}/%{name} \
     --localstatedir=%{_sharedstatedir}/%{name} \
     --datadir=%{_datadir}/%{name} \
-    --with-module-dir=/%{_lib}/%{name} \
+    --with-module-dir=/%{_libdir}/%{name} \
     --with-systemdsystemunitdir=%{_unitdir} \
     --enable-ipv6 \
     --enable-tcp-wrapper \
@@ -160,7 +157,7 @@ find %{buildroot} -name "*.la" -exec rm -f {} \;
 
 
 %check
-LD_LIBRARY_PATH=%{buildroot}/%{_lib}:%{buildroot}/%{_lib}/%{name} make check
+LD_LIBRARY_PATH=%{buildroot}/%{_libdir}:%{buildroot}/%{_libdir}/%{name} make check
 
 
 %clean
@@ -267,6 +264,10 @@ fi
 
 
 %changelog
+* Sun Apr 15 2012 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.2.5-9
+- Fedora 17’s unified filesystem (/usr-move)
+  http://fedoraproject.org/wiki/Features/UsrMove
+
 * Sun Apr 15 2012 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.2.5-8
 - Resolve the file conflict with rsyslog (#811058).
 - Don't tag the syslog-ng.service file as a configuration file.