diff --git a/pdftk-1.41-rpmopt.patch b/pdftk-1.41-rpmopt.patch
new file mode 100644
index 0000000..a3c8859
--- /dev/null
+++ b/pdftk-1.41-rpmopt.patch
@@ -0,0 +1,17 @@
+--- pdftk-1.41/pdftk/Makefile.RedHat.org	2006-09-21 19:37:38.000000000 +0200
++++ pdftk-1.41/pdftk/Makefile.RedHat	2007-02-26 20:50:28.000000000 +0100
+@@ -26,12 +26,12 @@
+ # if you want pdftk to ask before overwriting a file, set
+ # ASK_ABOUT_WARNINGS to true; otherwise: false; override this default
+ # with the dont_ask or do_ask command-line options
+-CPPFLAGS= -O2 -DPATH_DELIM=0x2f -DASK_ABOUT_WARNINGS=false -fdollars-in-identifiers
++CPPFLAGS= ${RPM_OPT_FLAGS} -DPATH_DELIM=0x2f -DASK_ABOUT_WARNINGS=false -fdollars-in-identifiers
+ CXXFLAGS= -lgcj
+ 
+ # itext compiler flags
+ # -O3 might cause pdftk to segfault on cat operation (gcc 3.4.4)
+-export GCJFLAGS= -O2
++export GCJFLAGS= ${RPM_OPT_FLAGS}
+ 
+ #
+ export ARFLAGS= rs
diff --git a/pdftk.spec b/pdftk.spec
index bfdd006..7a50ef1 100644
--- a/pdftk.spec
+++ b/pdftk.spec
@@ -1,11 +1,12 @@
 Summary: 	The PDF Tool Kit
 Name: 		pdftk
 Version: 	1.41
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 License:	GPL
 URL: 		http://www.pdfhacks.com/pdftk/
 Source0: 	http://www.pdfhacks.com/pdftk/%{name}-%{version}.tar.bz2
 Source1:        gpl.txt
+Patch1:	        pdftk-1.41-rpmopt.patch
 Group: 		Applications/Publishing
 BuildRoot: 	%{_tmppath}/%{name}-root
 BuildRequires:	gcc-java
@@ -32,6 +33,7 @@ C++ code to use iText's (itext-paulo) Java classes.
 
 %prep
 %setup -q
+%patch1 -p1 -b .org
 
 %build
 unset CLASSPATH && cd pdftk && make -f Makefile.RedHat && cd -
@@ -54,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*
 
 %changelog
+* Mon Feb 26 2007 Jochen Schmitt <s4504kr@zeus.herr-schmitt.de> 1.41-3
+- Use $$RPM_OPT_FLAGS (#228945)
+
 * Wed Nov 29 2006 Jochen Schmitt <Jochen herr-schmitt de> 1.41-2
 - New upstream release