diff --git a/bash.spec b/bash.spec
index d52cd57..4706e48 100644
--- a/bash.spec
+++ b/bash.spec
@@ -72,6 +72,9 @@ Patch122: bash-4.1-read-assoc-array.patch
 BuildRequires: texinfo bison
 BuildRequires: ncurses-devel
 BuildRequires: autoconf, gettext
+Conflicts: filesystem < 3
+Provides: /bin/sh
+Provides: /bin/bash
 
 %description
 The GNU Bourne Again shell (Bash) is a shell or command language
@@ -190,12 +193,8 @@ rm -f $RPM_BUILD_ROOT/%{_mandir}/man1/printf.1
 rm -f $RPM_BUILD_ROOT/%{_mandir}/man1/true.1
 rm -f $RPM_BUILD_ROOT/%{_mandir}/man1/false.1
 
-pushd $RPM_BUILD_ROOT
-mkdir ./bin
-mv ./usr/bin/bash ./bin
-ln -sf bash ./bin/sh
-rm -f .%{_infodir}/dir
-popd
+ln -sf bash $RPM_BUILD_ROOT%{_bindir}/sh
+rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 mkdir -p $RPM_BUILD_ROOT/etc/skel
 install -c -m644 %SOURCE1 $RPM_BUILD_ROOT/etc/skel/.bashrc
 install -c -m644 %SOURCE2 $RPM_BUILD_ROOT/etc/skel/.bash_profile
@@ -284,8 +283,8 @@ end
 %files -f %{name}.lang
 %defattr(-,root,root)
 %config(noreplace) /etc/skel/.b*
-/bin/sh
-/bin/bash
+%{_bindir}/sh
+%{_bindir}/bash
 %dir %{pkgdocdir}/
 %doc %{pkgdocdir}/COPYING
 %attr(0755,root,root) %{_bindir}/bashbug-*