diff --git a/screen-man-loginshell.diff b/screen-man-loginshell.diff
new file mode 100644
index 0000000..a822cbb
--- /dev/null
+++ b/screen-man-loginshell.diff
@@ -0,0 +1,133 @@
+--- screen-4.0.2/doc/screen.texinfo.orig	2003-12-05 14:51:46.000000000 +0100
++++ screen-4.0.2/doc/screen.texinfo	2008-05-14 15:29:52.252937000 +0200
+@@ -140,7 +140,8 @@
+ When a program terminates, @code{screen} (per default) kills the window
+ that contained it.  If this window was in the foreground, the display
+ switches to the previously displayed window; if none are left,
+-@code{screen} exits.
++@code{screen} exits. Shells usually distinguish between running as login-shell or sub-shell.
++Screen runs them as sub-shells, unless told otherwise (See @code{shell} .screenrc command).
+ 
+ Everything you type is sent to the program running in the current
+ window.  The only exception to this is the one keystroke that is used to
+@@ -151,7 +152,8 @@
+ customized to be anything you like, though they are always two
+ characters in length.
+ 
+-@code{Screen} does not understand the prefix @kbd{C-} to mean control.
++@code{Screen} does not understand the prefix @kbd{C-} to mean control, although
++this notation is used in this manual for readability.
+ Please use the caret notation (@kbd{^A} instead of @kbd{C-a}) as arguments
+ to e.g. the @code{escape} command or the @code{-e} option. @code{Screen}
+ will also print out control characters in caret notation.
+@@ -386,7 +388,7 @@
+ Set the default shell to be @var{program}.  By default, @code{screen}
+ uses the value of the environment variable @code{$SHELL}, or
+ @file{/bin/sh} if it is not defined.  This option is equivalent to the
+-@code{shell} command (@pxref{Shell}).
++@code{shell} command (@pxref{Shell}). See also there.
+ 
+ @item -S @var{sessionname}
+ Set the name of the new session to @var{sessionname}.  This option can
+@@ -1261,10 +1263,12 @@
+ Set the command to be used to create a new shell.  This overrides the
+ value of the environment variable @code{$SHELL}.  This is useful if
+ you'd like to run a tty-enhancer which is expecting to execute the
+-program specified in @code{$SHELL}.  If the command begins with
+-a @samp{-} character, the shell will be started as a login-shell.
++program specified in @code{$SHELL}.  
++If the command begins with a @samp{-} character, the shell will be started as a
++login-shell. Typical shells do only minimal initialization when not started as a login-shell.
++E.g. Bash will not read your @file{~/.bashrc} unless it is a login-shell.
+ 
+-@code{defshell} is currently a synonym to the @code{shell} command.
++@code{defshell} is currently a synonym to the @code{shell} .screenrc command.
+ @end deffn
+ 
+ @deffn Command shelltitle title
+@@ -1544,7 +1548,7 @@
+ Mainly the same as @code{detach}, but also sends a HANGUP signal
+ to the parent process of @code{screen}.@*
+ @emph{Caution}: This will result in a
+-logout if @code{screen} was started from your login shell.
++logout if @code{screen} was started from your login-shell.
+ @end deffn
+ 
+ @deffn Command pow_detach_msg [message]
+@@ -4932,6 +4936,7 @@
+ 
+ @item SHELL
+ Default shell program for opening windows (default @file{/bin/sh}).
++See also @code{shell} .screenrc command.
+ 
+ @item STY
+ Alternate socket name. If @code{screen} is invoked, and the environment variable
+--- screen-4.0.2/doc/screen.1.orig	2003-12-05 14:51:57.000000000 +0100
++++ screen-4.0.2/doc/screen.1	2008-05-14 15:21:06.956755000 +0200
+@@ -59,7 +59,8 @@
+ If this window was in the foreground, the display switches to the previous
+ window; if none are left,
+ .I screen
+-exits.
++exits. Shells usually distinguish between running as login-shell or sub-shell.
++Screen runs them as sub-shells, unless told otherwise (See \*Qshell\*U .screenrc command).
+ .PP
+ Everything you type is sent to the program running in the current window.
+ The only exception to this is the one keystroke that is used to initiate
+@@ -70,7 +71,8 @@
+ to be anything you like, though they are always two characters in length.
+ .PP
+ .I Screen
+-does not understand the prefix \*QC-\*U to mean control. 
++does not understand the prefix \*QC-\*U to mean control, although this notation is 
++used in this manual for readability. 
+ Please use the caret notation (\*Q^A\*U instead of \*QC-a\*U) as arguments
+ to e.g. the 
+ .I escape
+@@ -330,6 +332,7 @@
+ sets the default shell to the program specified, instead of the value
+ in the environment variable $SHELL (or \*Q/bin/sh\*U if not defined).
+ This can also be defined through the \*Qshell\*U .screenrc command.
++See also there.
+ .TP 5
+ .BI "\-S " sessionname
+ When creating a new session, this option can be used to specify a
+@@ -1557,7 +1560,7 @@
+ .ne 3
+ .BI "defshell " command
+ .PP
+-Synonym to the \fBshell\fP command. See there.
++Synonym to the \fBshell\fP .screenrc command. See there.
+ .sp
+ .ne 3
+ .BR "defsilence on" | off
+@@ -2381,7 +2384,7 @@
+ .IR screen .
+ CAUTION: This will result in a logout, when 
+ .I screen
+-was started from your login shell.
++was started from your login-shell.
+ .sp
+ .ne 3
+ .B pow_detach_msg
+@@ -2625,8 +2628,10 @@
+ Set the command to be used to create a new shell.
+ This overrides the value of the environment variable $SHELL.
+ This is useful if you'd like to run a tty-enhancer which is expecting to
+-execute the program specified in $SHELL. If the command begins with
+-a '-' character, the shell will be started as a login-shell.
++execute the program specified in $SHELL. 
++If the command begins with a '-' character, the shell will be started as a
++login-shell. Typical shells do only minimal initialization when not started as a login-shell.
++E.g. Bash will not read your \*Q~/.bashrc\*U unless it is a login-shell.
+ .sp
+ .ne 3
+ .B "shelltitle \fItitle\fP"
+@@ -4397,6 +4402,7 @@
+ Alternate user screenrc file.
+ .IP SHELL
+ Default shell program for opening windows (default \*Q/bin/sh\*U).
++See also \*Qshell\*U .screenrc command.
+ .IP STY
+ Alternate socket name.
+ .IP SYSSCREENRC
diff --git a/screen.changes b/screen.changes
index 3bca947..e009c8c 100644
--- a/screen.changes
+++ b/screen.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed May 14 15:31:04 CEST 2008 - jw@suse.de
+
+- A few lines added to docu explaining login-shells and 
+  starting with '-'  trick.
+
 -------------------------------------------------------------------
 Thu Mar 29 13:18:47 CEST 2007 - dmueller@suse.de
 
diff --git a/screen.spec b/screen.spec
index 77f14aa..f531314 100644
--- a/screen.spec
+++ b/screen.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package screen (Version 4.0.2)
 #
-# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -10,20 +10,22 @@
 
 # norootforbuild
 
+
 Name:           screen
 BuildRequires:  ncurses-devel utempter
-License:        GNU General Public License (GPL)
+License:        GPL v2 or later
 Group:          System/Console
 PreReq:         %install_info_prereq
-Autoreqprov:    on
+AutoReqProv:    on
 Version:        4.0.2
-Release:        94
+Release:        162
 Summary:        A program to allow multiple screens on a VT100/ANSI Terminal
 Source:         screen-4.0.2.tar.gz
 Patch:          screen-4.0.2.dif
 Patch1:         screen-__P.diff
 Patch2:         screen-gcc4.diff
 Patch3:         screen-4.0.2-comb.diff
+Patch4:         screen-man-loginshell.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -47,6 +49,7 @@ Authors:
 %patch1
 %patch2 -p1
 %patch3
+%patch4 -p1
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --infodir=%{_infodir} \
@@ -90,112 +93,115 @@ install -m 644 screenrc $RPM_BUILD_ROOT/etc/screenrc
 %install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz
 
 %changelog
-* Thu Mar 29 2007 - dmueller@suse.de
+* Wed May 14 2008 jw@suse.de
+- A few lines added to docu explaining login-shells and
+  starting with '-'  trick.
+* Thu Mar 29 2007 dmueller@suse.de
 - add ncurses-devel BuildRequires
-* Mon Oct 23 2006 - mls@suse.de
+* Mon Oct 23 2006 mls@suse.de
 - fix two bugs in handling of combining characters [#214412]
-* Fri Feb 10 2006 - mls@suse.de
+* Fri Feb 10 2006 mls@suse.de
 - enable support for 256 colors [#136684]
-* Thu Jan 26 2006 - sbrabec@suse.cz
+* Thu Jan 26 2006 sbrabec@suse.cz
 - Added %%install_info_prereq.
-* Wed Jan 25 2006 - mls@suse.de
+* Wed Jan 25 2006 mls@suse.de
 - converted neededforbuild to BuildRequires
-* Sat Oct 29 2005 - mls@suse.de
+* Sat Oct 29 2005 mls@suse.de
 - fix ut_time aliasing problem
-* Fri Apr 08 2005 - meissner@suse.de
+* Fri Apr 08 2005 meissner@suse.de
 - execl 0 -> (char*)0.
-* Tue Sep 28 2004 - mls@suse.de
+* Tue Sep 28 2004 mls@suse.de
 - clear ti/te for xterms so that users can use xterm's scrollbar
-* Sun Sep 12 2004 - kukuk@suse.de
+* Sun Sep 12 2004 kukuk@suse.de
 - Don't use __P from glibc
-* Mon Feb 16 2004 - mls@suse.de
+* Mon Feb 16 2004 mls@suse.de
 - fix socketdir quoting
-* Thu Feb 12 2004 - mls@suse.de
+* Thu Feb 12 2004 mls@suse.de
 - update to 4.0.2
 - move sockdirs to /var/run and include them in package
-* Sat Jan 10 2004 - adrian@suse.de
+* Sat Jan 10 2004 adrian@suse.de
 - add %%defattr
-* Thu Sep 18 2003 - mls@suse.de
+* Thu Sep 18 2003 mls@suse.de
 - update to 4.0.1 (fixes another bug of the parser)
-* Fri Sep 12 2003 - mls@suse.de
+* Fri Sep 12 2003 mls@suse.de
 - fix off by one error in variable expansion
-* Fri Sep 12 2003 - mls@suse.de
+* Fri Sep 12 2003 mls@suse.de
 - don't resize xterms on startup
-* Mon Sep 08 2003 - mls@suse.de
+* Mon Sep 08 2003 mls@suse.de
 - update to 4.0.0final
-* Wed Aug 27 2003 - mls@suse.de
+* Wed Aug 27 2003 mls@suse.de
 - update to 4.0.0beta2
-* Fri Aug 01 2003 - mls@suse.de
+* Fri Aug 01 2003 mls@suse.de
 - update to 4.0.0beta1
-* Thu Apr 24 2003 - ro@suse.de
+* Thu Apr 24 2003 ro@suse.de
 - fix install_info --delete call and move from preun to postun
-* Thu Mar 13 2003 - mls@suse.de
+* Thu Mar 13 2003 mls@suse.de
 - update to 3.9.15: changing the window title could append
   junk to the title
-* Wed Mar 12 2003 - mls@suse.de
+* Wed Mar 12 2003 mls@suse.de
 - update to 3.9.14: one small docu change and a small improvement
   in the windowlist command
-* Mon Feb 24 2003 - mls@suse.de
+* Mon Feb 24 2003 mls@suse.de
 - update to 3.9.14beta1
 - build screen with buildroot
 - remove xf86 dependency, use configure option instead
 - use install-info macro to install info page
-* Tue Oct 01 2002 - mls@suse.de
+* Tue Oct 01 2002 mls@suse.de
 - fix WrapChar() scrolling region reset code to always use a
   valid scrolling region (#20367)
-* Tue Sep 17 2002 - ro@suse.de
+* Tue Sep 17 2002 ro@suse.de
 - removed bogus self-provides
-* Thu Sep 05 2002 - mls@suse.de
+* Thu Sep 05 2002 mls@suse.de
 - update to official screen-3.9.13, contains one small bug
   fix
-* Thu Aug 29 2002 - mls@suse.de
+* Thu Aug 29 2002 mls@suse.de
 - update to official screen-3.9.12
-* Mon Aug 19 2002 - mls@suse.de
+* Mon Aug 19 2002 mls@suse.de
 - update to screen-3.9.12beta2
-* Fri Mar 08 2002 - kukuk@suse.de
+* Fri Mar 08 2002 kukuk@suse.de
 - Add /usr/share/screen to filelist
-* Wed Mar 06 2002 - mls@suse.de
+* Wed Mar 06 2002 mls@suse.de
 - disable pam support again
 - fix segmentation fault in screen's reattach password check
-* Fri Feb 22 2002 - mls@suse.de
+* Fri Feb 22 2002 mls@suse.de
 - fix passing of NUL bytes when recoding is active
 - moved uid/gid retrieval in front of FindEncoding
-* Mon Feb 18 2002 - mls@suse.de
+* Mon Feb 18 2002 mls@suse.de
 - added missing /usr/share/screen/utf8encodings files
 - small patch to fix hardstatus width
-* Thu Feb 14 2002 - mls@suse.de
+* Thu Feb 14 2002 mls@suse.de
 - update to official screen-3.9.11
 - enabled pam & localized dates
-* Mon Feb 11 2002 - mls@suse.de
+* Mon Feb 11 2002 mls@suse.de
 - update to screen-3.9.11beta7
-* Tue Jan 29 2002 - okir@suse.de
+* Tue Jan 29 2002 okir@suse.de
 - require utempter to build; zapped s bit
-* Fri Jan 25 2002 - okir@suse.de
+* Fri Jan 25 2002 okir@suse.de
 - require utempter to build
-* Wed Sep 05 2001 - mls@suse.de
+* Wed Sep 05 2001 mls@suse.de
 - nominal upgrade to screen-3.9.10
-* Mon Sep 03 2001 - mls@suse.de
+* Mon Sep 03 2001 mls@suse.de
 - Security fix for the Multiattach-bug in /usr/bin/screen
-* Mon Jul 23 2001 - bk@suse.de
+* Mon Jul 23 2001 bk@suse.de
 - added select-fix for fifo-testcase to build on s390x
-* Fri May 25 2001 - mls@suse.de
+* Fri May 25 2001 mls@suse.de
 - update -> 3.9.9
-* Tue May 08 2001 - mls@suse.de
+* Tue May 08 2001 mls@suse.de
 - added workaround for broken xterm to global screenrc
-* Fri Apr 27 2001 - mls@suse.de
+* Fri Apr 27 2001 mls@suse.de
 - fix screen -wipe (bugzilla bug #2990)
 - fix f10 function key (bugzilla bug #4326)
 - fix 0620 pty mode autodetection (bugzilla bug #6304)
-* Mon Sep 04 2000 - uli@suse.de
+* Mon Sep 04 2000 uli@suse.de
 - fix for root compromise using configurable visual bell string
-* Fri Feb 25 2000 - kukuk@suse.de
+* Fri Feb 25 2000 kukuk@suse.de
 - Move /usr/{info,man} -> /usr/share/{info,man}
-* Fri Oct 22 1999 - uli@suse.de
+* Fri Oct 22 1999 uli@suse.de
 - update -> 3.9.5
-* Mon Sep 13 1999 - bs@suse.de
+* Mon Sep 13 1999 bs@suse.de
 - ran old prepare_spec on spec file to switch to new prepare_spec.
-* Fri Nov 27 1998 - uli@suse.de
+* Fri Nov 27 1998 uli@suse.de
 - Update 3.7.3 -> 3.7.6
-* Wed Apr 30 1997 - florian@suse.de
+* Wed Apr 30 1997 florian@suse.de
 - update to version 3.7.3
 - mv /usr/etc/screenrc /etc/