diff --git a/mailx.spec b/mailx.spec
index 3027142..4d26312 100644
--- a/mailx.spec
+++ b/mailx.spec
@@ -45,7 +45,9 @@ BuildRequires: openssl-devel
 
 Obsoletes: nail <= %{version}
 Provides: nail = %{version}
-
+Conflicts: filesystem < 3
+Provides: /bin/mail
+Provides: /bin/mailx
 
 %description
 Mailx is an enhanced mail command, which provides the functionality
@@ -83,7 +85,7 @@ export INCLUDES
 %endif
 
 echo	PREFIX=%{_prefix} \
-	BINDIR=/bin \
+	BINDIR=%{_bindir} \
 	MANDIR=%{_mandir} \
 	SYSCONFDIR=%{_sysconfdir} \
 	MAILRC=%{mailrc} \
@@ -102,15 +104,9 @@ make `cat makeflags` \
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT STRIP=: `cat makeflags` install
 
-ln -s mailx $RPM_BUILD_ROOT/bin/mail
-
-install -d $RPM_BUILD_ROOT%{_bindir}
-pref=`echo %{_bindir} | sed 's,/[^/]*,../,g'`
-
-pushd $RPM_BUILD_ROOT%{_bindir}
-ln -s ${pref}bin/mailx Mail
-ln -s ${pref}bin/mailx nail
-popd
+ln -s mailx $RPM_BUILD_ROOT%{_bindir}/mail
+ln -s mailx $RPM_BUILD_ROOT%{_bindir}/Mail
+ln -s mailx $RPM_BUILD_ROOT%{_bindir}/nail
 
 pushd $RPM_BUILD_ROOT%{_mandir}/man1
 ln -s mailx.1 mail.1
@@ -149,7 +145,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc COPYING AUTHORS README
 %config(noreplace) %{mailrc}
-/bin/*
 %{_bindir}/*
 %{_mandir}/*/*