diff --git a/bison.changes b/bison.changes
index 9de48e1..bdfd92f 100644
--- a/bison.changes
+++ b/bison.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Jan 24 13:31:57 CET 2007 - mmarek@suse.cz
+
+- use more $RPM_OPT_FLAGS
+
 -------------------------------------------------------------------
 Mon Jun 26 15:21:48 CEST 2006 - mmarek@suse.cz
 
diff --git a/bison.spec b/bison.spec
index c17db26..c5f98f6 100644
--- a/bison.spec
+++ b/bison.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package bison (Version 2.3)
 #
-# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -12,13 +12,13 @@
 
 Name:           bison
 BuildRequires:  gcc-c++
-License:        GPL
+License:        GNU General Public License (GPL)
 Group:          Development/Languages/C and C++
 PreReq:         %install_info_prereq
 Autoreqprov:    on
 Requires:       m4
 Version:        2.3
-Release:        2
+Release:        25
 Summary:        The GNU Parser Generator
 URL:            http://www.gnu.org/software/bison/bison.html
 Source:         bison-%{version}.tar.bz2
@@ -32,17 +32,23 @@ Bison is a parser generator similar to yacc(1).
 
 Authors:
 --------
-    David J. MacKenzie <djm@gnu.ai.mit.edu>
-    Noah Friedman <friedman@ai.mit.edu>
-    Richard Stallman <rms@ai.mit.edu>
+    David J. MacKenzie <djm@gnu.org>
+    Noah Friedman <friedman@gnu.org>
+    Richard Stallman <rms@gnu.org>
 
 %prep
 %setup -q
 %patch1
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{_prefix} --mandir=%{_mandir} \
-        --infodir=%{_infodir} --libdir=%{_libdir}
+# CXXFLAGS is for c++ examples / test cases
+# these are not installed, but building them with $RPM_OPT_FLAGS could
+# catch possible problems in bison-generated C++ sources
+CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" ./configure \
+	--prefix=%{_prefix} \
+	--mandir=%{_mandir} \
+        --infodir=%{_infodir} \
+	--libdir=%{_libdir}
 make
 make check
 
@@ -75,6 +81,8 @@ rm -rf $RPM_BUILD_ROOT
 %install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz
 
 %changelog -n bison
+* Wed Jan 24 2007 - mmarek@suse.cz
+- use more $RPM_OPT_FLAGS
 * Mon Jun 26 2006 - mmarek@suse.cz
 - updated to 2.3
   * all generated scanners can be used in non-free programs
@@ -165,4 +173,4 @@ rm -rf $RPM_BUILD_ROOT
 - yacc emulation removed, because of existing mid-age technology
 * Fri May 16 1997 - rj@suse.de
 - version 1.25
-- yacc-functionality emulated thru script
+	- yacc-functionality emulated thru script