diff --git a/bootchart.spec b/bootchart.spec
index e9f7021..47e5b5d 100644
--- a/bootchart.spec
+++ b/bootchart.spec
@@ -1,4 +1,4 @@
-%define systemdsystemunitdir %(pkg-config systemd --variable=systemdsystemunitdir)
+%define systemdsystemunitdir %{_unitdir}
 
 Name:           bootchart 
 Version:        0.14.0
@@ -41,6 +41,7 @@ Group:		Applications/System
 Requires(post):   systemd-units
 Requires(preun):  systemd-units
 Requires(postun): systemd-units
+Conflicts:      filesystem < 3
 
 %description daemon
 A tool for performance analysis and visualization of the GNU/Linux boot
@@ -75,6 +76,7 @@ make CFLAGS="$RPM_OPT_FLAGS"
 %install
 make install \
 	DESTDIR=$RPM_BUILD_ROOT \
+	LIBDIR=%{_prefix}/lib \
 	PY_LIBDIR=%{python_libdir}\
 	NO_PYTHON_COMPILE=1 \
 	SYSTEMD_UNIT_DIR=%{systemdsystemunitdir}
@@ -85,7 +87,8 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/dracut.conf.d
 echo 'add_dracutmodules+=" bootchart "' > $RPM_BUILD_ROOT%{_sysconfdir}/dracut.conf.d/bootchartd.conf
 
 rm -f  $RPM_BUILD_ROOT/usr/share/docs/bootchart/README $RPM_BUILD_ROOT/usr/share/docs/bootchart/README.pybootchart
-
+mkdir -p $RPM_BUILD_ROOT/%{_sbindir}
+mv $RPM_BUILD_ROOT/sbin/* $RPM_BUILD_ROOT/%{_sbindir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -128,9 +131,9 @@ fi
 %files daemon
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING NEWS README* TODO
-%attr(0755,root,root) /sbin/bootchartd
-%dir %attr(0755,root,root) /lib/bootchart
-/lib/bootchart/*
+%attr(0755,root,root) %{_sbindir}/bootchartd
+%dir %attr(0755,root,root) %{_prefix}/lib/bootchart
+%{_prefix}/lib/bootchart/*
 %{systemdsystemunitdir}/*
 %config(noreplace) %{_sysconfdir}/bootchartd.conf
 %config(noreplace) %{_sysconfdir}/dracut.conf.d/bootchartd.conf