diff --git a/blender-wrapper b/blender-wrapper
index 8466c41..27c21db 100644
--- a/blender-wrapper
+++ b/blender-wrapper
@@ -6,7 +6,11 @@
 # In case user's home directory doesn't contain ~/.blender, copy it
 # from /usr/share/blender
 
-blend="blender"
+if [ -x /usr/bin/blender-freeworld.bin ]; then
+    blend="blender-freeworld"
+else
+    blend="blender"
+fi
 
 if [ ! -d ~/.blender ]; then
     install -d ~/.blender
@@ -32,9 +36,9 @@ if [ ! -d ~/.blender ]; then
     ln -sf /usr/share/blender/scripts/bpymodules ~/.blender/scripts/pbymodules
     ln -sf /usr/share/blender/scripts/* ~/.blender/scripts/
 
-    if [ -d /usr/lib64/$blend/plugins ]; then
-	ln -sf /usr/lib64/$blend/plugins/sequence ~/.blender/plugins/sequence
-	ln -sf /usr/lib64/$blend/plugins/texture ~/.blender/plugin/texture
+    if [ -d /usr/lib64/blender/plugins ]; then
+	ln -sf /usr/lib64/blender/plugins/sequence ~/.blender/plugins/sequence
+	ln -sf /usr/lib64/blender/plugins/texture ~/.blender/plugins/texture
     fi
 fi
 
@@ -75,12 +79,12 @@ elif [ -d /usr/lib/blender/scripts ] ; then
 fi
 
 
-if [ -d /usr/lib64/$blend/plugins ]; then
-    ln -sf /usr/lib64/$blend/plugins/sequence ~/.blender/plugins/sequence
-    ln -sf /usr/lib64/$blend/plugins/texture ~/.blender/plugins/texture
-elif [ -d /usr/lib/$blend/plugins ]; then
-    ln -sf /usr/lib/$blend/plugins/sequence ~/.blender/plugins/sequence
-    ln -sf /usr/lib/$blend/plugins/texture ~/.blender/plugins/texture    
+if [ -d /usr/lib64/blender/plugins ]; then
+    ln -sf /usr/lib64/blender/plugins/sequence ~/.blender/plugins/sequence
+    ln -sf /usr/lib64/blender/plugins/texture ~/.blender/plugins/texture
+elif [ -d /usr/lib/blender/plugins ]; then
+    ln -sf /usr/lib/blender/plugins/sequence ~/.blender/plugins/sequence
+    ln -sf /usr/lib/blender/plugins/texture ~/.blender/plugins/texture    
 fi
 
 /usr/bin/${blend}.bin $@
diff --git a/blender.spec b/blender.spec
index d7a8f98..d41af25 100644
--- a/blender.spec
+++ b/blender.spec
@@ -5,7 +5,7 @@
 
 Name:           blender
 Version:        2.49
-Release: 	3%{?dist}
+Release: 	4%{?dist}
 
 Summary:        3D modeling, animation, rendering and post-production
 
@@ -242,6 +242,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 %{_bindir}/blenderplayer.bin
 
 %changelog
+* Wed Jun  3 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.49-4
+- Rework on the blender wrapper script
+
 * Tue Jun  2 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.49-3
 - Try to build agains more system libraries as possible