diff --git a/netkit-rsh-0.17-pam_env.patch b/netkit-rsh-0.17-pam_env.patch
new file mode 100644
index 0000000..ca581d2
--- /dev/null
+++ b/netkit-rsh-0.17-pam_env.patch
@@ -0,0 +1,30 @@
+--- netkit-rsh-0.17/rshd/rshd.c.pam_env	2006-12-12 12:32:31.000000000 +0100
++++ netkit-rsh-0.17/rshd/rshd.c	2006-12-12 12:48:21.000000000 +0100
+@@ -375,6 +375,10 @@
+ 	const char *hostname;
+ 	u_short port;
+ 	int pv[2], pid, ifd;
++#ifdef USE_PAM
++        char** env;
++        int i;
++#endif
+ 
+ 	signal(SIGINT, SIG_DFL);
+ 	signal(SIGQUIT, SIG_DFL);
+@@ -522,6 +526,16 @@
+ 	shellname = strrchr(theshell, '/');
+ 	if (shellname) shellname++;
+ 	else shellname = theshell;
++#ifdef USE_PAM
++        env = pam_getenvlist(pamh);
++        if (NULL != env) {
++            for(i = 0; env[i]; i++) {
++                putenv(env[i]);
++                free(env[i]);
++            }
++            free(env);
++          }
++#endif
+ 
+ 	endpwent();
+ 	if (paranoid) {
diff --git a/rsh.spec b/rsh.spec
index c677659..8cb0ecb 100644
--- a/rsh.spec
+++ b/rsh.spec
@@ -1,7 +1,7 @@
 Summary: Clients for remote access commands (rsh, rlogin, rcp).
 Name: rsh
 Version: 0.17
-Release: 37%{?dist}
+Release: 38%{?dist}
 License: BSD
 Group: Applications/Internet
 
@@ -50,6 +50,7 @@ Patch27: netkit-rsh-0.17-rcp-largefile.patch
 Patch28: netkit-rsh-0.17-pam-rhost.patch
 Patch29: netkit-rsh-0.17-rlogin-linefeed.patch
 Patch30: netkit-rsh-0.17-ipv6.patch
+Patch31: netkit-rsh-0.17-pam_env.patch
 
 %description
 The rsh package contains a set of programs which allow users to run
@@ -112,6 +113,7 @@ from other machines.
 %patch28 -p1 -b .pam-rhost
 %patch29 -p1 -b .linefeed
 %patch30 -p1 -b .ipv6
+%patch31 -p1 -b .pam_env
 
 # No, I don't know what this is doing in the tarball.
 rm -f rexec/rexec
@@ -180,6 +182,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man8/*.8*
 
 %changelog
+* Tue Dec 05 2006 Adam Tkac <atkac redhat com> 0.17-38.fc7
+- rsh now load pan_env module correctly
+
 * Tue Oct 24 2006 Adam Tkac <atkac@redhat.com> 0.17-37
 - added xinetd dependency to rsh-server