diff --git a/nano.changes b/nano.changes
index 672ce5e..0201c1e 100644
--- a/nano.changes
+++ b/nano.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon May  5 02:01:05 CEST 2008 - crrodriguez@suse.de
+
+- fix for Feature No 300498 , use RPM_OPT_FLAGS everywhere. 
+
 -------------------------------------------------------------------
 Thu Apr 10 12:48:59 CEST 2008 - cthiel@suse.de
 
diff --git a/nano.spec b/nano.spec
index 6b61cb3..7f15669 100644
--- a/nano.spec
+++ b/nano.spec
@@ -19,7 +19,7 @@ Group:          Productivity/Editors/Other
 AutoReqProv:    on
 Summary:        Pico Editor Clone with Enhancements
 Version:        2.0.7
-Release:        22
+Release:        27
 Source:         %{name}-%{version}.tar.bz2
 Patch:          %{name}-2.0.6.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -46,8 +46,8 @@ Authors:
 %patch
 
 %build
-export CFLAGS="$CFLAGS $(ncursesw-config --cflags)"
-export LDFLAGS="$LDFLAGS $(ncursesw-config --libs)"
+export CFLAGS="%optflags  $(ncursesw-config --cflags)"
+export LDFLAGS="%optflags $(ncursesw-config --libs)"
 %configure --enable-all
 %{__make} %{?jobs:-j%jobs}
 
@@ -76,6 +76,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/nano
 
 %changelog
+* Mon May 05 2008 crrodriguez@suse.de
+- fix for Feature No 300498 , use RPM_OPT_FLAGS everywhere.
 * Thu Apr 10 2008 cthiel@suse.de
 - adapt package to use latests ncursesw
 * Sun Feb 24 2008 crrodriguez@suse.de