diff --git a/ansifilter-compiler_flags.patch b/ansifilter-compiler_flags.patch
index 896d136..d21e3a4 100644
--- a/ansifilter-compiler_flags.patch
+++ b/ansifilter-compiler_flags.patch
@@ -1,24 +1,50 @@
 ---
- src/makefile        |    2 
+ src/makefile        |   16 +-
  src/qt-gui/Makefile |  346 ----------------------------------------------------
- 2 files changed, 1 insertion(+), 347 deletions(-)
+ 2 files changed, 8 insertions(+), 354 deletions(-)
 
 Index: src/makefile
 ===================================================================
 --- src/makefile.orig	2012-01-04 16:17:59.000000000 +0100
-+++ src/makefile	2013-06-13 17:35:22.374397915 +0200
-@@ -4,7 +4,7 @@
++++ src/makefile	2013-10-28 13:59:17.438555472 +0100
+@@ -2,26 +2,26 @@
+ # This file will compile the ansifilter binary.
+ # See INSTALL for instructions.
  
- CC=g++
+-CC=g++
++CXX = g++
  
 -CFLAGS= -c -Wall -O2
-+CFLAGS=$(RPM_OPT_FLAGS) -c -Wall -O2
++CXXFLAGS = -c -Wall -O2 $(RPM_OPT_FLAGS)
  
- LDFLAGS=
+-LDFLAGS=
++LDFLAGS =
  
+-SOURCES=arg_parser.o stringtools.o cmdlineoptions.o main.o platform_fs.o\
++SOURCES = arg_parser.o stringtools.o cmdlineoptions.o main.o platform_fs.o\
+ codegenerator.o htmlgenerator.o texgenerator.o latexgenerator.o rtfgenerator.o\
+ plaintextgenerator.o bbcodegenerator.o elementstyle.o stylecolour.o preformatter.o
+ 
+-OBJECTS=$(SOURCES:.cpp=.o)
+-EXECUTABLE=ansifilter
++OBJECTS = $(SOURCES:.cpp=.o)
++EXECUTABLE = ansifilter
+ 
+ all: $(SOURCES) $(EXECUTABLE)
+ 
+ $(EXECUTABLE): $(OBJECTS)
+-	$(CC) $(LDFLAGS) $(OBJECTS) -o $@
++	$(CXX) $(LDFLAGS) $(OBJECTS) -o $@
+ 
+ .cpp.o:
+-	$(CC) $(CFLAGS) $< -o $@
++	$(CXX) $(CXXFLAGS) $< -o $@
+ 
+ clean:
+ 	@rm -f *.o
 Index: src/qt-gui/Makefile
 ===================================================================
---- src/qt-gui/Makefile	2013-06-13 17:35:22.375397892 +0200
+--- src/qt-gui/Makefile	2012-01-04 19:11:18.000000000 +0100
 +++ /dev/null	1970-01-01 00:00:00.000000000 +0000
 @@ -1,346 +0,0 @@
 -#############################################################################
diff --git a/ansifilter.changes b/ansifilter.changes
index bb94959..e64f583 100644
--- a/ansifilter.changes
+++ b/ansifilter.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Oct 28 14:00:25 CET 2013 - pth@suse.de
+
+- Reorder compiler flags and use CXX and CXXFALGS instead of
+  CC and CFLAGS.
+
 -------------------------------------------------------------------
 Thu Jun 13 17:07:02 CEST 2013 - pth@suse.de