diff --git a/bindkey.tcsh b/bindkey.tcsh
index 2f6569c..7e9c729 100644
--- a/bindkey.tcsh
+++ b/bindkey.tcsh
@@ -700,5 +700,79 @@ if ( "$CSHEDIT" == "emacs" ) then
 	bindkey    "^^[[B"	down-history
 endif
 #
+# Screen
+#
+if ( "$TERM" == "screen" ) then
+	bindkey    "\e[1;2D"	backward-word
+	bindkey    "\e[1;2C"	forward-word
+	bindkey    "\e[1;2A"	up-history
+	bindkey    "\e[1;2B"	down-history
+	bindkey    "\e[1;2H"	beginning-of-line
+	bindkey    "\e[1;2F"	end-of-line
+	bindkey    "\e[2;2~"	yank
+	bindkey    "\e[3;2~"	delete-char
+	bindkey    "\e[5;2~"	history-search-backward
+	bindkey    "\e[6;2~"	history-search-forward
+	bindkey    "\e[1;5D"	backward-word
+	bindkey    "\e[1;5C"	forward-word
+	bindkey    "\e[1;5A"	up-history
+	bindkey    "\e[1;5B"	down-history
+	bindkey    "\e[1;5H"	beginning-of-line
+	bindkey    "\e[1;5F"	end-of-line
+	bindkey    "\e[2;5~"	yank
+	bindkey    "\e[3;5~"	delete-char
+	bindkey    "\e[5;5~"	history-search-backward
+	bindkey    "\e[6;5~"	history-search-forward
+	bindkey    "\e[1;3D"	backward-word
+	bindkey    "\e[1;3C"	forward-word
+	bindkey    "\e[1;3A"	up-history
+	bindkey    "\e[1;3B"	down-history
+	bindkey    "\e[1;3H"	beginning-of-line
+	bindkey    "\e[1;3F"	end-of-line
+	bindkey    "\e[2;3~"	yank
+	bindkey    "\e[3;3~"	delete-char
+	bindkey    "\e[5;3~"	history-search-backward
+	bindkey    "\e[6;3~"	history-search-forward
+#
+	bindkey    "\e[1;2P"	undefined-key
+	bindkey    "\e[1;2Q"	undefined-key
+	bindkey    "\e[1;2R"	undefined-key
+	bindkey    "\e[1;2S"	undefined-key
+	bindkey    "\e[15;2~"	undefined-key
+	bindkey    "\e[17;2~"	undefined-key
+	bindkey    "\e[18;2~"	undefined-key
+	bindkey    "\e[19;2~"	undefined-key
+	bindkey    "\e[20;2~"	undefined-key
+	bindkey    "\e[21;2~"	undefined-key
+	bindkey    "\e[23;2~"	undefined-key
+	bindkey    "\e[24;2~"	undefined-key
+#
+	bindkey    "\e[1;5P"	undefined-key
+	bindkey    "\e[1;5Q"	undefined-key
+	bindkey    "\e[1;5R"	undefined-key
+	bindkey    "\e[1;5S"	undefined-key
+	bindkey    "\e[15;5~"	undefined-key
+	bindkey    "\e[17;5~"	undefined-key
+	bindkey    "\e[18;5~"	undefined-key
+	bindkey    "\e[19;5~"	undefined-key
+	bindkey    "\e[20;5~"	undefined-key
+	bindkey    "\e[21;5~"	undefined-key
+	bindkey    "\e[23;5~"	undefined-key
+	bindkey    "\e[24;5~"	undefined-key
+#
+	bindkey    "\e[1;3P"	undefined-key
+	bindkey    "\e[1;3Q"	undefined-key
+	bindkey    "\e[1;3R"	undefined-key
+	bindkey    "\e[1;3S"	undefined-key
+	bindkey    "\e[15;3~"	undefined-key
+	bindkey    "\e[17;3~"	undefined-key
+	bindkey    "\e[18;3~"	undefined-key
+	bindkey    "\e[19;3~"	undefined-key
+	bindkey    "\e[20;3~"	undefined-key
+	bindkey    "\e[21;3~"	undefined-key
+	bindkey    "\e[23;3~"	undefined-key
+	bindkey    "\e[24;3~"	undefined-key
+endif
+#
 # end bindkey.tcsh
 #
diff --git a/tcsh.changes b/tcsh.changes
index d97b7e7..3396339 100644
--- a/tcsh.changes
+++ b/tcsh.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Feb 28 14:59:52 CET 2011 - werner@suse.de
+
+- Add key support for screen terminal emluator
+
 -------------------------------------------------------------------
 Mon Feb  7 12:45:48 UTC 2011 - werner@suse.de
 
diff --git a/tcsh.spec b/tcsh.spec
index 368bf6b..7bc4aae 100644
--- a/tcsh.spec
+++ b/tcsh.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package tcsh (Version 6.17.02)
+# spec file for package tcsh
 #
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -26,7 +26,7 @@ Group:          System/Shells
 Requires:       gawk textutils
 AutoReqProv:    on
 Version:        6.17.02
-Release:        1
+Release:        2
 Summary:        The C SHell
 Source:         ftp.astron.com:/pub/tcsh/tcsh-6.17.02.tar.bz2
 Source1:        nls-iconv