diff --git a/zsh.spec b/zsh.spec
index 8a423d2..6f9507d 100644
--- a/zsh.spec
+++ b/zsh.spec
@@ -3,7 +3,7 @@
 Summary: A powerful interactive shell
 Name: zsh
 Version: 4.3.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: BSD
 URL: http://zsh.sunsite.dk/
 Group: System Environment/Shells
@@ -150,6 +150,10 @@ fi
 %doc Doc/*.html
 
 %changelog
+* Thu Oct 11 2007 James Antill <jantill@redhat.com> - 4.3.4-4
+- Fix login shell detection.
+- Resolves: 244684
+
 * Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 4.3.4-3
 - BuildRequire gawk.
 
diff --git a/zshrc.rhs b/zshrc.rhs
index b50aece..fb282b3 100644
--- a/zshrc.rhs
+++ b/zshrc.rhs
@@ -15,8 +15,8 @@ PROMPT='[%n@%m]%~%# '    # default prompt
 # bindkey -e             # emacs key bindings
 bindkey ' ' magic-space  # also do history expansion on space
 
-# from bashrc
-if [ "x$SHLVL" != "x1" ]; then # We're not a login shell
+# from bashrc, with zsh fixes
+if [[ ! -o login ]]; then # We're not a login shell
     for i in /etc/profile.d/*.sh; do
 	if [ -r "$i" ]; then
 	    . $i