diff --git a/csmash.changes b/csmash.changes
index d60fc08..82418a9 100644
--- a/csmash.changes
+++ b/csmash.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Mar 23 18:49:59 CET 2007 - lmichnovic@suse.cz
+
+- forcing use of CXXFLAGS for compilation
+
 -------------------------------------------------------------------
 Mon Aug  7 17:43:22 CEST 2006 - lmichnovic@suse.cz
 
diff --git a/csmash.spec b/csmash.spec
index f0a9443..ab72b22 100644
--- a/csmash.spec
+++ b/csmash.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package csmash (Version 0.6.6)
 #
-# 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,11 +12,11 @@
 
 Name:           csmash
 BuildRequires:  SDL_image-devel SDL_mixer-devel gcc-c++ gtk1-compat-devel libdrm-devel update-desktop-files xorg-x11-devel
-License:        GPL
+License:        GNU General Public License (GPL)
 Group:          Amusements/Games/3D/Other
 Autoreqprov:    on
 Version:        0.6.6
-Release:        16
+Release:        60
 Source:         %{name}-%{version}.tar.bz2
 Source1:        danslatristesse2-48.ogg
 Source2:        %name.desktop
@@ -53,15 +53,16 @@ gettextize -f
 aclocal -I m4
 autoreconf --force --install
 automake
+export CXXFLAGS="$RPM_OPT_FLAGS" 
 %if "%(xft-config --prefix)" == "/usr"
-CXXFLAGS="$RPM_OPT_FLAGS" \
 ./configure --prefix=%{_prefix} --datadir=%{_datadir} --bindir=%{_bindir} \
 --x-includes=/usr/include --x-libraries=/usr/%_lib
 %else
-CXXFLAGS="$RPM_OPT_FLAGS" \
 ./configure --prefix=%{_prefix} --datadir=%{_datadir} --bindir=%{_bindir}
 %endif
-make %{?jobs:-j%jobs}
+# it is needed to call CXXFLAGS together with make
+# it is not sufficient to export them only
+make %{?jobs:-j%jobs} CXXFLAGS="-I/usr/include -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT $RPM_OPT_FLAGS"
 
 %install
 make DESTDIR=$RPM_BUILD_ROOT install
@@ -79,7 +80,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc README README.jp AUTHORS COPYING CREDITS INSTALL NEWS ChangeLog
 /usr/share/applications/%name.desktop
 
-%changelog -n csmash
+%changelog
+* Fri Mar 23 2007 - lmichnovic@suse.cz
+- forcing use of CXXFLAGS for compilation
 * Mon Aug 07 2006 - lmichnovic@suse.cz
 - using gettextize -f to fix not expanding macro MKINSTALLDIRS
 * Fri Jul 28 2006 - lmichnovic@suse.cz