diff --git a/blender.spec b/blender.spec
index 6ce20d2..d7df5d6 100644
--- a/blender.spec
+++ b/blender.spec
@@ -3,15 +3,15 @@
 
 Name:           blender
 Version:        2.45
-Release: 	15%{?dist}
+Release: 	16%{?dist}
 
 Summary:        3D modeling, animation, rendering and post-production
 
 Group:          Applications/Multimedia
 License:        GPLv2
 URL:            http://www.blender.org
-# During a Legel issue (#239476) the package contains a cusromized
-# source package created as fellow.
+# This is a customized source package without ffmpeg, which is
+# patent encumbered (#239476)
 # wget http://download.blender.org/source/blender-%{version}.tar.gz
 # tar -zxv blender-%{version}.tar.gz
 # rm -rf blender-%{version}/extern/ffmpeg
@@ -71,8 +71,7 @@ animation, rendering and post-production to interactive creation and playback.
 Professionals and novices can easily and inexpensively publish stand-alone,
 secure, multi-platform content to the web, CD-ROMs, and other media.
 
-This version doesn't contains ffmpeg support, so that any features may be not
-available.
+This version doesn't contains ffmpeg support.
 
 %prep
 %setup -q 
@@ -95,12 +94,7 @@ sed -e 's|@LIB@|%{_libdir}|g' -e "s/@PYVER@/$PYVER/g" \
 	 <%{SOURCE7} >user-config.py
 
 %build
-
-#
-# Don't use $RPM_OPT_FLAGS (see #199418)
-#
-
-scons %{?_smp_mflags} blenderplayer BF_QUIET=0
+scons %{?_smp_mflags} blenderplayer BF_QUIET=0 {CFLAGS,CXXFLAGS}='%{optflags}'
 
 install -d release/plugins/include
 install -m 644 source/blender/blenpluginapi/*.h release/plugins/include
@@ -162,7 +156,6 @@ install -m 655 release/plugins/texture/*.so ${RPM_BUILD_ROOT}/%{plugins}/texture
 
 desktop-file-install --vendor fedora                    \
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications       \
-  --add-category X-Fedora                               \
   %{SOURCE4}
 
 %find_lang %name
@@ -191,6 +184,10 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 %{_datadir}/mime/packages/blender.xml
 
 %changelog
+* Sat Dec 27 2008 Lubomir Rintel <lkundrak@v3.sk> - 2.45-16
+- Use proper compiler flags (see #199418)
+- Minor grammar & language fixes and tidy-ups
+
 * Fri Dec 26 2008 Lubomir Rintel <lkundrak@v3.sk> 2.45-15
 - Fix quoting in CVE-2008-4863 patch