diff --git a/.cvsignore b/.cvsignore
index a10c671..1e69018 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-openssh-3.8.1p1.tar.gz
+openssh-3.9p1.tar.gz
 x11-ssh-askpass-1.2.4.1.tar.gz
diff --git a/openssh-3.9p1.tar.gz.sig b/openssh-3.9p1.tar.gz.sig
new file mode 100644
index 0000000..9b64804
--- /dev/null
+++ b/openssh-3.9p1.tar.gz.sig
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.2 (OpenBSD)
+
+iD8DBQBBIgAxzo7LA4b/nEgRArlqAJ0UhIfcfbz+oAxn8AsiOeHBVMwFXwCgkXcX
+hxmfq8nv/+hpiid1j9lAUx8=
+=P4zN
+-----END PGP SIGNATURE-----
diff --git a/openssh.spec b/openssh.spec
index 3020ece..ab24d4c 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -78,8 +78,8 @@
 
 Summary: The OpenSSH implementation of SSH protocol versions 1 and 2.
 Name: openssh
-Version: 3.8.1p1
-%define rel 5
+Version: 3.9p1
+%define rel 1
 %if %{rescue}
 Release: %{rel}rescue
 %else
@@ -89,11 +89,10 @@ URL: http://www.openssh.com/portable.html
 Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
 Source1: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz.sig
 Source2: http://www.pobox.com/~jmknoble/software/x11-ssh-askpass/x11-ssh-askpass-%{aversion}.tar.gz
-Patch0: openssh-3.8.1p1-redhat.patch
+Patch0: openssh-3.9p1-redhat.patch
 Patch1: openssh-3.6.1p2-groups.patch
 Patch2: openssh-3.8.1p1-skip-initial.patch
 Patch3: openssh-3.8.1p1-krb5-config.patch
-Patch4: openssh-3.8.1p1-pam_password.patch
 Patch12: openssh-selinux.patch
 Patch20: openssh-3.8p1-gssapimitm.patch
 License: BSD
@@ -219,7 +218,6 @@ environment.
 %patch1 -p1 -b .groups
 %patch2 -p1 -b .skip-initial
 %patch3 -p1 -b .krb5-config
-%patch4 -p0 -b .pam_password
 
 %if %{WITH_SELINUX}
 #SELinux
@@ -493,6 +491,9 @@ fi
 %endif
 
 %changelog
+* Tue Aug 24 2004 Daniel Walsh <dwalsh@redhat.com> 3.9p1-1
+- Update to upstream
+
 * Sun Aug 1 2004 Alan Cox <alan@redhat.com> 3.8.1p1-5
 - Apply buildreq fixup patch (#125296)
 
diff --git a/sources b/sources
index b7e358a..e87b0f7 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-1dbfd40ae683f822ae917eebf171ca42  openssh-3.8.1p1.tar.gz
+8e1774d0b52aff08f817f3987442a16e  openssh-3.9p1.tar.gz
 8f2e41f3f7eaa8543a2440454637f3c3  x11-ssh-askpass-1.2.4.1.tar.gz