diff --git a/widelands-b13-return-non-void.diff b/widelands-b13-return-non-void.diff
index a2f9c6f..e8b1ad1 100644
--- a/widelands-b13-return-non-void.diff
+++ b/widelands-b13-return-non-void.diff
@@ -11,12 +11,12 @@ diff -ur widelands-b13/src/events/event_factory.cc widelands-b13.patched//src/ev
  
 diff -ur widelands-b13/src/map.h widelands-b13.patched//src/map.h
 --- widelands-b13/src/map.h	2008-10-10 22:53:46.000000000 +0200
-+++ widelands-b13.patched//src/map.h	2009-05-01 22:40:39.000000000 +0200
++++ widelands-b13.patched//src/map.h	2009-05-01 22:58:33.000000000 +0200
 @@ -1038,6 +1038,7 @@
  	case Map_Object::WALK_W:  return  l_n(f);
  	default:
  		assert(false);
-+		case Map_Object::WALK_NW: return tl_n(f);
++		return tl_n(f);
  	}
  }
  
diff --git a/widelands.spec b/widelands.spec
index 5e99023..e17d04c 100644
--- a/widelands.spec
+++ b/widelands.spec
@@ -40,7 +40,7 @@ perhaps will have a thought, what Widelands is all about.
 sed -i 's#flagi#%{optflags}##' build/scons-tools/scons_configure.py
 
 %build
-export CCFLAGS="$optflags"
+export CCFLAGS="$RPM_OPT_FLAGS"
 scons build=release datadir=%{_datadir}/%{name} bindir=%{_bindir} localedir=%{_datadir}/%{name}/locale build_id=%{build_id}
 
 # ./build-widelands.sh