diff --git a/dbus.spec b/dbus.spec
index d8c85fe..a416ef1 100644
--- a/dbus.spec
+++ b/dbus.spec
@@ -36,14 +36,13 @@ Requires(postun): systemd-units
 Requires: libselinux >= %{libselinux_version}
 Requires: dbus-libs = %{epoch}:%{version}-%{release}
 Requires(pre): /usr/sbin/useradd
+Conflicts: filesystem < 3
+Provides: /bin/dbus-send
 
 # Conflict with cups prior to configuration file change, so that the
 # %postun service condrestart works.
 Conflicts: cups < 1:1.1.20-4
 
-# FIXME this should be upstreamed; need --daemon-bindir=/bin and --bindir=/usr/bin or something?
-Patch0: bindir.patch
-
 %description
 D-BUS is a system for sending messages between applications. It is
 used both for the system-wide message bus service, and as a
@@ -53,6 +52,7 @@ per-user-login-session messaging facility.
 Summary: Libraries for accessing D-BUS
 Group: Development/Libraries
 Obsoletes: dbus < 1.1.2-3
+Conflicts: filesystem < 3
 
 %description libs
 This package contains lowlevel libraries for accessing D-BUS.
@@ -93,16 +93,14 @@ in this separate package so server systems need not install X.
 # Make sure they are not
 /bin/chmod 0644 COPYING ChangeLog NEWS
 
-%patch0 -p1 -b .bindir
-
 autoreconf -f -i
 
 %build
-COMMON_ARGS="--enable-libaudit --enable-selinux=yes --with-init-scripts=redhat --with-system-pid-file=%{_localstatedir}/run/messagebus.pid --with-dbus-user=dbus --libdir=/%{_lib} --bindir=/bin --sysconfdir=/etc --exec-prefix=/ --libexecdir=/%{_lib}/dbus-1"
+COMMON_ARGS="--enable-libaudit --enable-selinux=yes --with-init-scripts=redhat --with-system-pid-file=%{_localstatedir}/run/messagebus.pid --with-dbus-user=dbus --sysconfdir=/etc --libexecdir=%{_libdir}/dbus-1"
 
 # leave verbose mode so people can debug their apps but make sure to
 # turn it off on stable releases with --disable-verbose-mode
-%configure $COMMON_ARGS --disable-tests --disable-asserts --enable-doxygen-docs --enable-xml-docs --with-systemdsystemunitdir=/lib/systemd/system/
+%configure $COMMON_ARGS --disable-tests --disable-asserts --enable-doxygen-docs --enable-xml-docs --with-systemdsystemunitdir=%{_unitdir}
 make
 
 %install
@@ -110,20 +108,8 @@ rm -rf %{buildroot}
 
 make install DESTDIR=%{buildroot}
 
-mkdir -p %{buildroot}/%{_libdir}/pkgconfig
-
-#change the arch-deps.h include directory to /usr/lib[64] instead of /lib[64]
-sed -e 's@-I${libdir}@-I${prefix}/%{_lib}@' %{buildroot}/%{_lib}/pkgconfig/dbus-1.pc > %{buildroot}/%{_libdir}/pkgconfig/dbus-1.pc
-rm -f %{buildroot}/%{_lib}/pkgconfig/dbus-1.pc
-
-mkdir -p %{buildroot}/%{_bindir}
-mv -f %{buildroot}/bin/dbus-launch %{buildroot}/%{_bindir}
-mkdir -p %{buildroot}/%{_libdir}/dbus-1.0/include/
-mv -f %{buildroot}/%{_lib}/dbus-1.0/include/* %{buildroot}/%{_libdir}/dbus-1.0/include/
-rm -rf %{buildroot}/%{_lib}/dbus-1.0
-
-rm -f %{buildroot}/%{_lib}/*.a
-rm -f %{buildroot}/%{_lib}/*.la
+rm -f %{buildroot}/%{_libdir}/*.a
+rm -f %{buildroot}/%{_libdir}/*.la
 
 install -D -m755 %{SOURCE2} %{buildroot}%{_sysconfdir}/X11/xinit/xinitrc.d/00-start-message-bus.sh
 
@@ -132,7 +118,7 @@ mkdir -p %{buildroot}%{_datadir}/dbus-1/interfaces
 # Make sure that when somebody asks for D-Bus under the name of the
 # old SysV script, that he ends up with the standard dbus.service name
 # now.
-ln -s dbus.service %{buildroot}/lib/systemd/system/messagebus.service
+ln -s dbus.service %{buildroot}/%{_unitdir}/messagebus.service
 
 ## %find_lang %{gettext_package}
 # Delete the old legacy sysv init script
@@ -175,11 +161,11 @@ fi
 %dir %{_sysconfdir}/dbus-1/session.d
 %ghost %dir %{_localstatedir}/run/dbus
 %dir %{_localstatedir}/lib/dbus/
-/bin/dbus-daemon
-/bin/dbus-send
-/bin/dbus-cleanup-sockets
-/bin/dbus-monitor
-/bin/dbus-uuidgen
+%{_bindir}/dbus-daemon
+%{_bindir}/dbus-send
+%{_bindir}/dbus-cleanup-sockets
+%{_bindir}/dbus-monitor
+%{_bindir}/dbus-uuidgen
 %{_mandir}/man*/dbus-cleanup-sockets.1.gz
 %{_mandir}/man*/dbus-daemon.1.gz
 %{_mandir}/man*/dbus-monitor.1.gz
@@ -189,20 +175,20 @@ fi
 %{_datadir}/dbus-1/services
 %{_datadir}/dbus-1/system-services
 %{_datadir}/dbus-1/interfaces
-%dir /%{_lib}/dbus-1
+%dir %{_libdir}/dbus-1
 # See doc/system-activation.txt in source tarball for the rationale
 # behind these permissions
-%attr(4750,root,dbus) /%{_lib}/dbus-1/dbus-daemon-launch-helper
-/lib/systemd/system/dbus.service
-/lib/systemd/system/dbus.socket
-/lib/systemd/system/dbus.target.wants/dbus.socket
-/lib/systemd/system/messagebus.service
-/lib/systemd/system/multi-user.target.wants/dbus.service
-/lib/systemd/system/sockets.target.wants/dbus.socket
+%attr(4750,root,dbus) %{_libdir}/dbus-1/dbus-daemon-launch-helper
+%{_unitdir}/dbus.service
+%{_unitdir}/dbus.socket
+%{_unitdir}/dbus.target.wants/dbus.socket
+%{_unitdir}/messagebus.service
+%{_unitdir}/multi-user.target.wants/dbus.service
+%{_unitdir}/sockets.target.wants/dbus.socket
 
 %files libs
 %defattr(-,root,root,-)
-/%{_lib}/*dbus-1*.so.*
+%{_libdir}/*dbus-1*.so.*
 
 %files x11
 %defattr(-,root,root)
@@ -219,7 +205,7 @@ fi
 %files devel
 %defattr(-,root,root)
 
-/%{_lib}/lib*.so
+%{_libdir}/lib*.so
 %dir %{_libdir}/dbus-1.0
 %{_libdir}/dbus-1.0/include/
 %{_libdir}/pkgconfig/dbus-1.pc