diff --git a/ncurses-5.9-avoid-line-markers.dif b/ncurses-5.9-avoid-line-markers.dif
new file mode 100644
index 0000000..8cea752
--- /dev/null
+++ b/ncurses-5.9-avoid-line-markers.dif
@@ -0,0 +1,11 @@
+--- ncurses/Makefile.in.orig	2015-01-21 13:27:02.427199242 +0100
++++ ncurses/Makefile.in	2015-01-21 13:27:11.946311063 +0100
+@@ -219,7 +219,7 @@
+ 	sh -e $(srcdir)/run_cmd.sh $(tinfo)/MKfallback.sh $(TERMINFO) $(TERMINFO_SRC) $(TIC_PATH) $(FALLBACK_LIST) >$@
+ 
+ ./lib_gen.c : $(base)/MKlib_gen.sh ../include/curses.h
+-	sh -e $(base)/MKlib_gen.sh "$(CPP) $(CPPFLAGS)" "$(AWK)" generated <../include/curses.h >$@
++	sh -e $(base)/MKlib_gen.sh "$(CPP) $(CPPFLAGS) -P" "$(AWK)" generated <../include/curses.h >$@
+ 
+ init_keytry.h: make_keys$(BUILD_EXEEXT) keys.list
+ 	./make_keys$(BUILD_EXEEXT) keys.list > $@
diff --git a/ncurses.changes b/ncurses.changes
index a2130be..2b264ab 100644
--- a/ncurses.changes
+++ b/ncurses.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Jan 21 12:22:05 UTC 2015 - rguenther@suse.com
+
+- Add ncurses-5.9-avoid-line-markers.dif to pass -P to the preprocessor
+  when generating lib_gen.c to avoid breaking the parsing with AWK
+  of the preprocessor output of GCC 4.9 and up.
+
 -------------------------------------------------------------------
 Mon Jan 12 08:49:11 UTC 2015 - werner@suse.de
 
diff --git a/ncurses.spec b/ncurses.spec
index 99f451e..94480ea 100644
--- a/ncurses.spec
+++ b/ncurses.spec
@@ -59,6 +59,7 @@ Patch1:         ncurses-5.9-ibm327x.dif
 Patch3:         ncurses-5.9-overwrite.dif
 Patch4:         ncurses-5.7-tack.dif
 Patch5:         ncurses-5.9-environment.dif
+Patch6:         ncurses-5.9-avoid-line-markers.dif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %global         _sysconfdir /etc
 %global         _miscdir    %{_datadir}/misc
@@ -279,6 +280,7 @@ mv tack-* tack
 %patch -P 4 -p0 -b .hs
 %patch -P 5 -p0 -b .lc
 %patch -P 0 -p0 -b .p0
+%patch -P 6 -p0 -b .p6
 rm -vf include/ncurses_dll.h
 rm -vf mkdirs.sh
 rm -vf tar-copy.sh