diff --git a/.cvsignore b/.cvsignore
index 7a520a4..b2d34a9 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-screen-3.9.8.tar.gz
+screen-3.9.9.tar.gz
diff --git a/screen.spec b/screen.spec
index 05abe42..8d7e82d 100644
--- a/screen.spec
+++ b/screen.spec
@@ -1,22 +1,22 @@
+%define __spec_install_post %{nil}
+
 Summary: A screen manager that supports multiple logins on one terminal.
 Name: screen
-Version: 3.9.8
-Release: 3
+Version: 3.9.9
+Release: 2
 License: GPL
 Group: Applications/System
 Source0: ftp://ftp.uni-erlangen.de/pub/utilities/screen/screen-%{version}.tar.gz
 Patch0: screen-3.7.6-compat21.patch
-Patch1: screen-3.9.4-makeinfo.patch
-Patch2: screen-3.9.8-osdef.patch
-Patch4: screen-3.9.5-jbj.patch
-Patch5: screen-ia64.patch
-Patch7: screen-3.9.5-docbugs.patch
-Patch8: screen-3.9.5-deletehack.patch
-Patch9: screen-3.9.5-closealldocbug.patch
-Patch10: screen-3.9.8-select.patch
-Prefix: %{_prefix}
+Patch1: screen-3.9.8-osdef.patch
+Patch2: screen-ia64.patch
+Patch3: screen-3.9.9-deletehack.patch
+Patch4: screen-3.9.8-select.patch
+# Doesnt work, but needs to.
+Patch5: screen-3.9.9-pam.patch
+Patch6: screen-3.9.9-doc.patch
 Prereq: /sbin/install-info
-BuildRoot: /var/tmp/%{name}-root
+BuildRoot: %{_tmppath}/%{name}-root
 
 %description
 The screen utility allows you to have multiple logins on just one
@@ -31,33 +31,38 @@ support multiple logins on one terminal.
 %setup -q
 
 %patch0 -p1 -b .compat21
-%patch1 -p1 -b .makeinfo
-%patch2 -p0
-%patch4 -p1 -b .jbj
-%patch5 -p1 -b .ia64
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
+%patch1 -p0 -b .osdef
+%patch2 -p1 -b .ia64
+%patch3 -p1 -b .deletehack
+%patch4 -p1 -b .select
+#This thrashes the screen, but would be nice if it worked
+#%patch5 -p1 -b .pam 
+%patch6 -p1 -b .doc
 
 %build
 
 autoconf
 %configure
 
+sed -e 's/.*HAVE_BRAILLE.*/#define HAVE_BRAILLE 1/;
+	s/.*BUILTIN_TELNET.*/#define BUILTIN_TELNET 1/;
+	s/ETCSCREENRC \/usr\/etc\/screenrc/ETCSCREENRC \/etc\/screenrc/;' < config.h > config.tmp.h
+mv config.tmp.h config.h
 
-perl -pi -e 's|.*#.*PTYMODE.*|#define PTYMODE 0620|' config.h
-perl -pi -e 's|.*#.*PTYGROUP.*|#define PTYGROUP 5|' config.h
-
-perl -pi -e 's|.*#undef HAVE_BRAILLE.*|#define HAVE_BRAILLE 1|' config.h
-perl -pi -e 's|.*#undef BUILTIN_TELNET.*|#define BUILTIN_TELNET 1|' config.h
+sed -e 's/\/usr\/local\/etc/\/etc/;g' < etc/etcscreenrc > etc/etcscreenrc.tmp
+mv etc/etcscreenrc.tmp etc/etcscreenrc
 
-perl -pi -e 's|%{_prefix}/etc/screenrc|/etc/screenrc|' config.h
-perl -pi -e 's|/usr/local/etc/screenrc|/etc/screenrc|' etc/etcscreenrc doc/*
-perl -pi -e 's|/local/etc/screenrc|/etc/screenrc|' doc/*
+find doc -type f | ( while read line;
+do
+	sed -e 's/\(\/usr\)\?\/local\/etc/\/etc/;' < $line > $line.tmp;
+	mv $line.tmp $line
+done; )
+	
 rm doc/screen.info*
 
-make CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE"
+#CFLAGS="-O1 -ggdb -DDEBUG -D_GNU_SOURCE"
+CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE"
+make CFLAGS="$CFLAGS"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -76,6 +81,10 @@ mkdir -p $RPM_BUILD_ROOT/etc/skel
 install -c -m 0444 etc/etcscreenrc $RPM_BUILD_ROOT/etc/screenrc
 install -c -m 0644 etc/screenrc $RPM_BUILD_ROOT/etc/skel/.screenrc
 
+pushd %{buildroot}%{_mandir}
+gzip -9 */*.1
+popd
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -94,7 +103,7 @@ fi
 
 %files
 %defattr(-,root,root)
-%doc NEWS README FAQ doc/README.DOTSCREEN
+%doc NEWS README doc/FAQ doc/README.DOTSCREEN
 
 %attr(755,root,root) %{_bindir}/screen
 %{_mandir}/man1/screen.*
@@ -104,6 +113,17 @@ fi
 %config /etc/skel/.screenrc
 
 %changelog
+* Tue Jul 10 2001 Tim Powers <timp@redhat.com>
+- gzip manpage
+
+* Mon Jun 25 2001 Crutcher Dunnavant <crutcher@redhat.com>
+- itterate to 3.9.9
+- fixed FAQ
+- added electro@mrduck.net's PAM patch, crazy :)
+
+* Sun Jun 24 2001 Elliot Lee <sopwith@redhat.com>
+- Bump release + rebuild.
+
 * Tue Feb 13 2001 Florian La Roche <Florian.LaRoche@redhat.de>
 - fix configure.in to use correct code to check for select()
 
diff --git a/sources b/sources
index 2f83505..d7ab039 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8ddfebe32c2d45410ce89ea9779bb1cf  screen-3.9.8.tar.gz
+9a8b1d6c7438c64b884c4f7d7662afdc  screen-3.9.9.tar.gz