diff --git a/Botan-use_rpm_opt_flags.patch b/Botan-use_rpm_opt_flags.patch
new file mode 100644
index 0000000..d4ca641
--- /dev/null
+++ b/Botan-use_rpm_opt_flags.patch
@@ -0,0 +1,13 @@
+Index: Makefile
+===================================================================
+--- Makefile.orig	2009-11-27 15:09:06.000000000 +0100
++++ Makefile	2009-11-27 16:14:16.117516962 +0100
+@@ -5,7 +5,7 @@ CXX           = g++ -m64
+ LIB_OPT       = -O2 -finline-functions
+ CHECK_OPT     = -O2
+ MACH_OPT      = 
+-LANG_FLAGS    = -D_REENTRANT -ansi -Wno-long-long
++LANG_FLAGS    = -D_REENTRANT -ansi -Wno-long-long $(RPM_OPT_FLAGS)
+ WARN_FLAGS    = -W -Wall
+ SO_OBJ_FLAGS  = -fPIC
+ SO_LINK_CMD   = $(CXX) -shared -fPIC -Wl,-soname,$(SONAME)
diff --git a/Botan.changes b/Botan.changes
index 2fbedb8..65b25e8 100644
--- a/Botan.changes
+++ b/Botan.changes
@@ -1,8 +1,3 @@
--------------------------------------------------------------------
-Mon Dec 21 17:34:49 UTC 2009 - coolo@novell.com
-
-- do not patch arch specific Makefiles, but simply pass WARN_FLAGS
-
 -------------------------------------------------------------------
 Mon Dec 21 00:32:43 CET 2009 - ro@suse.de
 
diff --git a/Botan.spec b/Botan.spec
index 7b1f1c0..dbe0311 100644
--- a/Botan.spec
+++ b/Botan.spec
@@ -29,6 +29,7 @@ AutoReqProv:    on
 Prefix:         /usr
 Group:          Development/Libraries/C and C++
 Source:         %{name}-%{version}.tar.bz2
+Source1:        Botan-use_rpm_opt_flags.patch
 Patch0:         Botan-inttypes.patch
 Patch1:         Botan-ull_constants.patch.bz2
 Patch2:         Botan-fix_install_paths.patch
@@ -104,7 +105,8 @@ export RPM_OPT_FLAGS
 				--with-gnump \
 				--with-openssl \
 				--with-tr1-implementation=system 
-make %{?_smp_mflags} WARN_FLAGS="$RPM_OPT_FLAGS"
+patch -p0 -i %{S:1}
+make %{?_smp_mflags}
 
 %install
 %makeinstall