diff --git a/parted.spec b/parted.spec
index 59abb90..5568402 100644
--- a/parted.spec
+++ b/parted.spec
@@ -1,6 +1,3 @@
-%define _sbindir /sbin
-%define _libdir /%{_lib}
-
 Summary: The GNU disk partition manipulation program
 Name:    parted
 Version: 3.0
@@ -54,6 +51,7 @@ Requires(post): /sbin/ldconfig
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 Requires(postun): /sbin/ldconfig
+Conflicts: filesystem < 3
 
 %description
 The GNU Parted program allows you to create, destroy, resize, move,
@@ -103,16 +101,6 @@ V=1 %{__make} %{?_smp_mflags}
 %{__rm} -rf %{buildroot}
 %{__make} install DESTDIR=%{buildroot}
 
-# Move devel package components in to the correct location
-%{__mkdir} -p %{buildroot}%{_exec_prefix}/%{_lib}
-%{__mv} %{buildroot}%{_libdir}/libparted.so %{buildroot}%{_exec_prefix}/%{_lib}
-%{__mv} %{buildroot}%{_libdir}/pkgconfig %{buildroot}%{_exec_prefix}/%{_lib}
-pushd %{buildroot}%{_exec_prefix}/%{_lib}
-reallibrary="$(readlink libparted.so)"
-%{__rm} -f libparted.so
-ln -sf ../../%{_lib}/${reallibrary} libparted.so
-popd
-
 # Remove components we do not ship
 %{__rm} -rf %{buildroot}%{_libdir}/*.la
 %{__rm} -rf %{buildroot}%{_infodir}/dir
@@ -158,8 +146,8 @@ fi
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/parted
-%{_exec_prefix}/%{_lib}/libparted.so
-%{_exec_prefix}/%{_lib}/pkgconfig/libparted.pc
+%{_libdir}/libparted.so
+%{_libdir}/pkgconfig/libparted.pc
 
 
 %changelog