diff --git a/tcsh-6.15.00-norm-cmd.dif b/tcsh-6.15.00-norm-cmd.dif
new file mode 100644
index 0000000..1affeca
--- /dev/null
+++ b/tcsh-6.15.00-norm-cmd.dif
@@ -0,0 +1,47 @@
+--- ed.defns.c
++++ ed.defns.c	2007-08-28 12:02:42.862588122 +0200
+@@ -1412,16 +1412,6 @@ editinit(void)
+     f->desc = CSAVS(3, 52, "Execute command");
+ 
+     f++;
+-    f->name = "newline-and-hold";
+-    f->func = F_NEWLINE_HOLD;
+-    f->desc = CSAVS(3, 122, "Execute command and keep current line");
+-
+-    f++;
+-    f->name = "newline-and-down-history";
+-    f->func = F_NEWLINE_DOWN_HIST;
+-    f->desc = CSAVS(3, 123, "Execute command and move to next history line");
+-
+-    f++;
+     f->name = "normalize-path";
+     f->func = F_PATH_NORM;
+     f->desc = CSAVS(3, 53, 
+@@ -1788,6 +1778,16 @@ editinit(void)
+     f->desc = CSAVS(3, 121, "(WIN32 only) Page visible console window down");
+ 
+     f++;
++    f->name = "newline-and-hold";
++    f->func = F_NEWLINE_HOLD;
++    f->desc = CSAVS(3, 122, "Execute command and keep current line");
++
++    f++;
++    f->name = "newline-and-down-history";
++    f->func = F_NEWLINE_DOWN_HIST;
++    f->desc = CSAVS(3, 123, "Execute command and move to next history line");
++
++    f++;
+     f->name = NULL;
+     f->func = 0;
+     f->desc = NULL;
+--- tw.parse.c
++++ tw.parse.c	2007-08-28 12:03:41.288831024 +0200
+@@ -433,7 +433,7 @@ tenematch(Char *inputline, int num_read,
+ 	Char *p;
+ 	int found;
+ 
+-	found = !cmd_expand(qline.s + wordp, &p);
++	found = cmd_expand(qline.s + wordp, &p);
+ 	
+ 	if (!found) {
+ 	    xfree(p);
diff --git a/tcsh-6.15.00.dif b/tcsh-6.15.00.dif
index e6e2f62..afd5511 100644
--- a/tcsh-6.15.00.dif
+++ b/tcsh-6.15.00.dif
@@ -1,10 +1,11 @@
 --- .pkgextract
 +++ .pkgextract	2006-04-25 14:58:31.000000000 +0200
-@@ -0,0 +1,4 @@
+@@ -0,0 +1,5 @@
 +patch -p0 -s --suffix=.spell     < ../tcsh-6.15.00-spelling.dif
 +patch -p0 -s --suffix=.utf8      < ../tcsh-6.15.00-utf8.dif
 +patch -p0 -s --suffix=.pipe      < ../tcsh-6.15.00-pipe.dif
 +patch -p0 -s --suffix=.longjmp   < ../tcsh-6.15.00-longjmp.dif
++patch -p0 -s --suffix=.normcmd   < ../tcsh-6.15.00-norm-cmd.dif
 --- Makefile.in
 +++ Makefile.in	2006-04-25 14:58:31.000000000 +0200
 @@ -510,12 +510,12 @@ vgrind:
diff --git a/tcsh.changes b/tcsh.changes
index 8bafeb6..47796d6 100644
--- a/tcsh.changes
+++ b/tcsh.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Aug 28 12:16:59 CEST 2007 - werner@suse.de
+
+- Correct boolean expression for normalize-command (bug #304903)
+
 -------------------------------------------------------------------
 Mon Jul 23 16:26:34 CEST 2007 - werner@suse.de
 
diff --git a/tcsh.spec b/tcsh.spec
index dca4a82..cca2562 100644
--- a/tcsh.spec
+++ b/tcsh.spec
@@ -18,7 +18,7 @@ Group:          System/Shells
 Requires:       gawk textutils
 Autoreqprov:    on
 Version:        6.15.00
-Release:        5
+Release:        15
 Summary:        The C SHell
 Source:         ftp.astron.com:/pub/tcsh/tcsh-6.15.00.tar.bz2
 Source1:        nls-iconv
@@ -29,6 +29,7 @@ Patch1:         tcsh-6.15.00-spelling.dif
 Patch2:         tcsh-6.15.00-utf8.dif
 Patch3:         tcsh-6.15.00-pipe.dif
 Patch4:         tcsh-6.15.00-longjmp.dif
+Patch5:         tcsh-6.15.00-norm-cmd.dif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -51,6 +52,7 @@ Authors:
 %patch2 -p0 -b .utf8
 %patch3 -p0 -b .pipe
 %patch4 -p0 -b .longjmp
+%patch5 -p0 -b .normcmd
 %patch
     sh $RPM_SOURCE_DIR/nls-iconv
 
@@ -133,6 +135,8 @@ Authors:
 %{_datadir}/locale/*/LC_MESSAGES/tcsh
 
 %changelog
+* Tue Aug 28 2007 - werner@suse.de
+- Correct boolean expression for normalize-command (bug #304903)
 * Mon Jul 23 2007 - werner@suse.de
 - Add workaround to avoid run onto already cleaned stack pointer
   after an error (bug #293395)