diff --git a/.cvsignore b/.cvsignore
index ea1728e..9281767 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
 x11-ssh-askpass-1.2.4.1.tar.gz
-openssh-4.0p1-noacss.tar.bz2
+openssh-4.1p1-noacss.tar.bz2
diff --git a/openssh.spec b/openssh.spec
index a78ecaa..98b627a 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -73,8 +73,8 @@
 
 Summary: The OpenSSH implementation of SSH protocol versions 1 and 2.
 Name: openssh
-Version: 4.0p1
-%define rel 3
+Version: 4.1p1
+%define rel 1
 %if %{rescue}
 Release: %{rel}rescue
 %else
@@ -99,8 +99,8 @@ Patch21: openssh-3.9p1-safe-stop.patch
 Patch22: openssh-3.9p1-askpass-keep-above.patch
 Patch23: openssh-3.9p1-no-log-signal.patch
 Patch24: openssh-3.9p1-fromto-remote.patch
-Patch25: openssh-4.0p1-local-forward.patch
 Patch26: openssh-4.0p1-krb5-valid.patch
+Patch27: openssh-4.1p1-pam-loginuid.patch
 License: BSD
 Group: Applications/Internet
 BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
@@ -160,7 +160,7 @@ Group: System Environment/Daemons
 Obsoletes: ssh-server
 PreReq: openssh = %{version}-%{release}, chkconfig >= 0.9, /usr/sbin/useradd
 %if ! %{build6x}
-Requires: /etc/pam.d/system-auth
+Requires: pam >= 0.78-7, /etc/pam.d/system-auth
 %endif
 
 %package askpass
@@ -237,8 +237,8 @@ environment.
 %patch22 -p1 -b .keep-above
 %patch23 -p1 -b .signal
 %patch24 -p1 -b .fromto-remote
-%patch25 -p1 -b .local-forward
 %patch26 -p0 -b .krb5-valid
+%patch27 -p1 -b .loginuid
 
 autoreconf
 
@@ -507,6 +507,10 @@ fi
 %endif
 
 %changelog
+* Mon Jun  6 2005 Tomas Mraz <tmraz@redhat.com> 4.1p1-1
+- upgrade to a new upstream version
+- call pam_loginuid as a pam session module
+
 * Mon May 16 2005 Tomas Mraz <tmraz@redhat.com> 4.0p1-3
 - link libselinux only to sshd (#157678)
 
diff --git a/sources b/sources
index b1365fa..63f7c6b 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 8f2e41f3f7eaa8543a2440454637f3c3  x11-ssh-askpass-1.2.4.1.tar.gz
-0b2ec566a44a88bffb00219bf6aa78db  openssh-4.0p1-noacss.tar.bz2
+85a161a501f4b7779eb0dc8fd60872bc  openssh-4.1p1-noacss.tar.bz2