diff --git a/CMakeLists.txt b/CMakeLists.txt
index d8e8bc38..c913260d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -56,12 +56,16 @@ IF(CMAKE_COMPILER_IS_GNUCXX OR MINGW)
 	SET(CMAKE_CXX_FLAGS_MINSIZEREL "-O3 ${CMAKE_CXX_FLAGS_MINSIZEREL} -O3 ")
 	SET(CMAKE_EXE_LINKER_FLAGS_MINSIZEREL "${CMAKE_EXE_LINKER_FLAGS_MINSIZEREL} -s")  ## Strip binary 
 
-	# The stuff below gets SVN Global Revision # but ONLY when calling cmake!
-	# the FindSubversion.cmake module is part of the standard distribution
-	include(FindSubversion)
-	# extract working copy information for SOURCE_DIR into MY_XXX variables
-	Subversion_WC_INFO(${PROJECT_SOURCE_DIR} MG)
-	#add_definitions(-DSVNVERSION="${MG_WC_REVISION}")
+	OPTION(WANT_SVN_STAMP "use svn stamp" ON)
+	IF(WANT_SVN_STAMP)
+		# The stuff below gets SVN Global Revision # but ONLY when calling cmake!
+		# the FindSubversion.cmake module is part of the standard distribution
+		include(FindSubversion)
+		# extract working copy information for SOURCE_DIR into MY_XXX variables
+		Subversion_WC_INFO(${PROJECT_SOURCE_DIR} MG)
+		#add_definitions(-DSVNVERSION="${MG_WC_REVISION}")
+	ENDIF()
+
 	SET(SVN_VERSION_CMD "-DSVNVERSION='\\\"${MG_WC_REVISION}\\\"'")
 
 	IF(UNIX AND NOT APPLE)
diff --git a/mk/linux/makerelease.sh b/mk/linux/makerelease.sh
index 96d66bb6..80ebdab6 100755
--- a/mk/linux/makerelease.sh
+++ b/mk/linux/makerelease.sh
@@ -8,27 +8,34 @@ echo "Creating source package in $RELEASEDIR"
 
 rm -rf $RELEASEDIR
 mkdir -p $RELEASEDIR
+mkdir -p $RELEASEDIR/source
 # copy sources
 pushd "`pwd`/../../source"
-find glest_game/ \( -name "*.cpp" -o -name "*.h" -o -name "*.c" \) -exec cp -p --parents "{}" $RELEASEDIR ';'
-find shared_lib/ \( -name "*.cpp" -o -name "*.h" -o -name "*.c" \) -exec cp -p --parents "{}" $RELEASEDIR ';'
-find glest_map_editor/ \( -name "*.cpp" -o -name "*.h" -o -name "*.xpm" -o -name "*.c" \) -exec cp -p --parents "{}" $RELEASEDIR ';'
-find g3d_viewer/ \( -name "*.cpp" -o -name "*.h" -o -name "*.c" \) -exec cp -p --parents "{}" $RELEASEDIR ';'
-find configurator/ \( -name "*.cpp" -o -name "*.h" -o -name "*.c" \) -exec cp -p --parents "{}" $RELEASEDIR ';'
-find masterserver/ \( -name "*.php" -o -name "*.sql" \) -exec cp -p --parents "{}" $RELEASEDIR ';'
-find tools/ \( -name "*.cpp" -o -name "*.h" -o -name "*.c" -o -name "*.pl" -o -name "*.sh" -o -name "*.css" -o -name "*.html" -o -name "*.ini" -o -name "*.ico" -o -name "*.txt" -o -name "*.dtd" -o -name "*.png" -o -name "*.py" -o -name "README" -o -name "INSTALL" -o -name "COPYING" \) -exec cp -p --parents "{}" $RELEASEDIR ';'
-popd
-#AUTOCONFSTUFF="configure.ac autogen.sh Jamrules Jamfile `find mk/jam -name "*.jam"` `find mk/autoconf -name "*.m4" -o -name "config.*" -o -name "*sh"`"
+find glest_game/ \( -name "*.cpp" -o -name "*.h" -o -name "*.c" -o -name "CMake*" \) -exec cp -p --parents "{}" $RELEASEDIR/source ';'
+find shared_lib/ \( -name "*.cpp" -o -name "*.h" -o -name "*.c" -o -name "CMake*" \) -exec cp -p --parents "{}" $RELEASEDIR/source ';'
+find glest_map_editor/ \( -name "*.cpp" -o -name "*.h" -o -name "*.xpm" -o -name "*.c" -o -name "CMake*" \) -exec cp -p --parents "{}" $RELEASEDIR/source ';'
+find g3d_viewer/ \( -name "*.cpp" -o -name "*.h" -o -name "*.c" -o -name "CMake*" \) -exec cp -p --parents "{}" $RELEASEDIR/source ';'
+find configurator/ \( -name "*.cpp" -o -name "*.h" -o -name "*.c" -o -name "CMake*" \) -exec cp -p --parents "{}" $RELEASEDIR/source ';'
+find masterserver/ \( -name "*.php" -o -name "*.sql" -o -name "CMake*" \) -exec cp -p --parents "{}" $RELEASEDIR/source ';'
+find tools/ \( -name "*.cpp" -o -name "*.h" -o -name "*.c" -o -name "*.pl" -o -name "*.sh" -o -name "*.css" -o -name "*.html" -o -name "*.ini" -o -name "*.ico" -o -name "*.txt" -o -name "*.dtd" -o -name "*.png" -o -name "*.py" -o -name "README" -o -name "INSTALL" -o -name "COPYING" -o -name "CMake*" \) -exec cp -p --parents "{}" $RELEASEDIR/source ';'
+
+pushd "../"
+find mk/cmake/ \( -name "*.cmake" \) -exec cp -p --parents "{}" $RELEASEDIR ';'
+find mk/macosx/ \( -name "*.txt" -o -name "*.plist" -o -name "*.icns" -o -name "PkgInfo" \) -exec cp -p --parents "{}" $RELEASEDIR ';'
+popd
+
+popd
 
-#cp -p --parents $AUTOCONFSTUFF $RELEASEDIR
 cp -p ../../docs/readme*.txt ../../docs/*license*.txt $RELEASEDIR
 cp -p glest.ini $RELEASEDIR
 cp -p glestkeys.ini $RELEASEDIR
 cp -p servers.ini $RELEASEDIR
 cp -p glest.ico $RELEASEDIR
+cp -p glest.ico $RELEASEDIR
+cp -p ../../CMake* $RELEASEDIR
 
 pushd $RELEASEDIR
-./autogen.sh
+#./autogen.sh
 popd
 
 pushd release