diff --git a/.cvsignore b/.cvsignore
index 4a0d1ad..76b8839 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-screen-3.9.13.tar.bz2
+screen-3.9.15.tar.gz
diff --git a/screen.spec b/screen.spec
index 79b09e4..d28d871 100644
--- a/screen.spec
+++ b/screen.spec
@@ -1,7 +1,7 @@
 Summary: A screen manager that supports multiple logins on one terminal.
 Name: screen
-Version: 3.9.13
-Release: 5
+Version: 3.9.15
+Release: 11
 License: GPL2
 Group: Applications/System
 URL: http://www.gnu.org/software/screen
@@ -10,11 +10,10 @@ BuildRoot: %{_tmppath}/%{name}-root
 BuildRequires: ncurses-devel
 Requires: ncurses
 
-%define autoconf_ver -2.13
-
+#
 # The one and only true source
 #
-Source0: ftp://ftp.uni-erlangen.de/pub/utilities/screen/screen-%{version}.tar.bz2
+Source0: ftp://ftp.uni-erlangen.de/pub/utilities/screen/screen-%{version}.tar.gz
 
 # Except for the PAM configuration, that is.
 Source1: screen.pam
@@ -27,7 +26,7 @@ Patch1: screen-3.9.13-ia64.patch
 # really end users should visit /etc/screenrc and tweak
 # it to suit their personal preferances
 #
-Patch2: screen-3.9.13-screenrc.patch
+Patch2: screen-3.9.15-screenrc.patch
 
 # Due to the way the build system creates rpms in a buildroot
 # we need this tweak for utf8encodings
@@ -41,6 +40,9 @@ Patch4: screen-3.9.11-no-stripping-or-elf.patch
 # Change sig_ign to sig_dfl in exit path
 Patch5: screen-3.9.13-child.patch
 
+#
+Patch6: screen-3.9.15-home-screendir.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
@@ -60,14 +62,11 @@ support multiple logins on one terminal.
 %patch3 -p1 -b .utf8-install
 %patch4 -p1 -b .no-stripping-or-elf
 %patch5 -p0 -b .child
+%patch6 -p1 -b .screendir
 
 libtoolize --copy --force
 
-if [ -x /usr/bin/autoconf%{autoconf_ver} ]; then
-autoconf%{autoconf_ver}
-else
 autoconf
-fi;
 
 %build
 
@@ -77,7 +76,8 @@ fi;
 	--enable-rxvt_osc \
 	--enable-locale \
 	--enable-telnet \
-	--with-sys-screenrc="/etc/screenrc"
+	--with-sys-screenrc="/etc/screenrc" \
+	--with-socket-dir="/tmp"
 
 # We would like to have braille support.
 #
@@ -131,12 +131,6 @@ rm -rf $RPM_BUILD_ROOT
 %post
 /sbin/install-info %{_infodir}/screen.info.gz %{_infodir}/dir --entry="* screen: (screen).             Terminal multiplexer."
 
-if [ -d /tmp/screens ]; then
-    # we're not setuid root anymore
-    #
-    chmod 777 /tmp/screens
-fi
-
 
 %preun
 if [ $1 = 0 ]; then
@@ -156,6 +150,46 @@ fi
 %config /etc/pam.d/screen
 
 %changelog
+* Tue Jul 10 2003 Lon Hohberger <lhh@redhat.com> 3.9.15-11
+- Rebuilt 
+
+* Tue Jul 10 2003 Lon Hohberger <lhh@redhat.com> 3.9.15-10
+- Put the bindkey back in for now.
+
+* Mon Jul 01 2003 Lon Hohberger <lhh@redhat.com> 3.9.15-9
+- Rebuilt
+
+* Mon Jul 01 2003 Lon Hohberger <lhh@redhat.com> 3.9.15-8
+- Change screen's behavior to do the following: Attempt to use
+~/.screen as the screen directory.  Failing that (ie, on files
+systems without Unix sockets support), try using /tmp/screen-<USER>.
+This prevents a user from creating /tmp/screens (which inherits
+the sticky bit from /tmp, preventing other users from using screen),
+as well as *tries* to be more secure.
+
+* Tue Jul 01 2003 Lon Hohberger <lhh@redhat.com> 3.9.15-7
+- Rebuilt
+
+* Tue Jul 01 2003 Lon Hohberger <lhh@redhat.com> 3.9.15-6
+- Disable system-wide read/write dir in /tmp; use user's ~/.screen
+directory for screen sessions. (#98320)
+
+* Mon Jun 16 2003 Lon Hohberger <lhh@redhat.com> 3.9.15-5
+- Rebuilt
+
+* Fri Jun 13 2003 Lon Hohberger <lhh@redhat.com> 3.9.15-4
+- Removed bindkey entry; stty `tput kbs` sets this correctly for
+the screen terminal type.
+
+* Wed Jun 04 2003 Elliot Lee <sopwith@redhat.com>
+- rebuilt
+
+* Wed Apr 16 2003 Lon Hohberger <lhh@redhat.com> 3.9.15-2
+- Rebuilt
+
+* Wed Apr 16 2003 Lon Hohberger <lhh@redhat.com> 3.9.15-1
+- Import of 3.9.15 from upstream.
+
 * Fri Feb 14 2003 Lon Hohberger <lhh@redhat.com> 3.9.13-5
 - Closes a potential window to raise the warning noted
 in #84232.
diff --git a/sources b/sources
index 9500c86..09d7abd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cc58c0b73b17da8c66896cdc818d229a  screen-3.9.13.tar.bz2
+0dff6fdc3fbbceabf25a43710fbfe75f  screen-3.9.15.tar.gz