diff --git a/screen.spec b/screen.spec
index 09a98ee..4bbe3cd 100644
--- a/screen.spec
+++ b/screen.spec
@@ -1,12 +1,14 @@
 Summary: A screen manager that supports multiple logins on one terminal
 Name: screen
 Version: 4.0.2
-Release: 15.1
+Release: 16%{?dist}
 License: GPL2
 Group: Applications/System
 URL: http://www.gnu.org/software/screen
-Prereq: /sbin/install-info, /usr/sbin/groupadd
-BuildRoot: %{_tmppath}/%{name}-root
+Requires(pre): /usr/sbin/groupadd
+Requires(preun): /sbin/install-info
+Requires(post): /sbin/install-info
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: ncurses-devel texinfo pam-devel libtool
 
 #
@@ -31,7 +33,8 @@ Patch3: screen-4.0.1-etcscreenrc.patch
 # Due to the way the build system creates rpms in a buildroot
 # we need this tweak for utf8encodings
 #
-Patch4: screen-3.9.11-utf8-install.patch
+# This is not needed anymore
+#Patch4: screen-3.9.11-utf8-install.patch
 
 # We need to allow rpm to strip the binary and we don't have a
 # libelf dependancy
@@ -54,6 +57,7 @@ Patch9: screen-4.0.2-lock-shortcut.patch
 Patch10: screen-4.0.2-lib64.patch
 Patch11: screen-4.0.2-maxstr.patch
 
+
 %description
 The screen utility allows you to have multiple logins on just one
 terminal. Screen is useful for users who telnet into a machine or are
@@ -71,7 +75,7 @@ support multiple logins on one terminal.
 %patch1 -p1 -b .ia64
 %patch2 -p1 -b .screenrc
 #%patch3 -p1 -b .etcscreenrc
-%patch4 -p1 -b .utf8-install
+#%patch4 -p1 -b .utf8-install
 %patch5 -p1 -b .no-stripping-or-elf
 #%patch8 -p1 -b .logname
 
@@ -122,13 +126,14 @@ rm doc/screen.info*
 make clean
 
 CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" make $BUILD_MAKE_FLAGS
+make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 mkdir -p $RPM_BUILD_ROOT/etc
-%makeinstall DDESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
 
 ( cd $RPM_BUILD_ROOT
   rm -f .%{_bindir}/screen.old .%{_bindir}/screen
@@ -141,7 +146,7 @@ cat etc/screenrc >> $RPM_BUILD_ROOT/etc/screenrc
 # Better not forget to copy the pam file around
 #
 mkdir -p $RPM_BUILD_ROOT/etc/pam.d
-install -m 0644 $RPM_SOURCE_DIR/screen.pam $RPM_BUILD_ROOT/etc/pam.d/screen
+install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/etc/pam.d/screen
 
 # Create the socket dir
 mkdir -p $RPM_BUILD_ROOT/var/run/screen
@@ -175,10 +180,22 @@ fi
 %{_infodir}/screen.info*
 %{_datadir}/screen
 %attr(775,root,screen) %{_localstatedir}/run/screen
-%config /etc/screenrc
-%config /etc/pam.d/screen
+%config(noreplace) /etc/screenrc
+%config(noreplace) /etc/pam.d/screen
 
 %changelog
+* Wed Aug 16 2006 Jesse Keating <jkeating@redhat.com> - 4.0.2-16
+- Don't use %%makeinstall, instead make install.
+- Change DDESTDIR to DESTDIR to do the right thing.
+- Comment out utf patch as it is no longer necessary.
+- Add dist tag
+- Change PreReq to correct Requires(pre), Requires(post), Requires(preun) 
+- Don't use RPM_SOURCE_DIR, reference the source file directly
+- Do the compiling (make) in %%build, not %%install
+- Don't replace /etc/screenrc if the user has modified it
+- Ditto /etc/pam.d/screen
+- Change the buildroot to follow guidelines
+
 * Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 4.0.2-15.1
 - rebuild