diff --git a/docs/README.txt b/docs/README.txt
index 20c4a10f..2a78a73c 100644
--- a/docs/README.txt
+++ b/docs/README.txt
@@ -109,9 +109,8 @@ Please refer to the packagers' installation guides.
 
 3. Configuration
 
-MegaGlest can be configured in three ways:
+MegaGlest can be configured in two ways:
 - in-game config menu: most options
-- using the separate MegaGlest Configurator
 - manual editing of glestuser.ini (options) and glestuserkeys.ini (hotkeys)
 
 DO NOT directly edit glest.ini and glestkeys.ini but rather edit glestuser.ini
diff --git a/mk/linux/makerelease.sh b/mk/linux/makerelease.sh
index 099a7307..1043fe94 100755
--- a/mk/linux/makerelease.sh
+++ b/mk/linux/makerelease.sh
@@ -45,7 +45,6 @@ svn export --force "$CURRENTDIR/../../data/glest_game/megaglest.ico" $RELEASEDIR
 svn export --force "$CURRENTDIR/../../data/glest_game/g3dviewer.ico" $RELEASEDIR/g3dviewer.ico
 svn export --force "$CURRENTDIR/../../data/glest_game/editor.ico" $RELEASEDIR/editor.ico
 svn export --force "$CURRENTDIR/start_megaglest" $RELEASEDIR/start_megaglest
-svn export --force "$CURRENTDIR/start_megaglest_configurator" $RELEASEDIR/start_megaglest_configurator
 svn export --force "$CURRENTDIR/start_megaglest_g3dviewer" $RELEASEDIR/start_megaglest_g3dviewer
 svn export --force "$CURRENTDIR/start_megaglest_mapeditor" $RELEASEDIR/start_megaglest_mapeditor
 svn export --force "$CURRENTDIR/../../CMakeLists.txt" $RELEASEDIR/CMakeLists.txt
diff --git a/mk/linux/start_megaglest_configurator b/mk/linux/start_megaglest_configurator
deleted file mode 100755
index fe92e213..00000000
--- a/mk/linux/start_megaglest_configurator
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-# Library directory
-LIBDIR="lib"
-
-# If we are launching from a symlink, such as /usr/local/bin/runglest.sh, we need to get where
-# the symlink points to
-pth="`readlink $0`"
-
-# $pth will be empty if our start path wasnt a symlink
-if [ $pth ]; then
-	GAMEDIR="`dirname $pth`"
-else
-	GAMEDIR="`dirname $0`"
-fi
- 
-# Change to the game dir, and go!
-cd $GAMEDIR
-# export game library directory
-test -n "${LIBDIR}" && export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${GAMEDIR}/${LIBDIR}"
-
-./megaglest_configurator $@
diff --git a/mk/windoze/Installer/MegaGlestUpdater.nsi b/mk/windoze/Installer/MegaGlestUpdater.nsi
index 8692a983..0c03aaf1 100644
--- a/mk/windoze/Installer/MegaGlestUpdater.nsi
+++ b/mk/windoze/Installer/MegaGlestUpdater.nsi
@@ -2,10 +2,10 @@
 ; General Attributes
 
 !define APNAME MegaGlest
-!define APVER 3.7.0-beta2
+!define APVER 3.7.0-beta2
 !define APNAME_OLD Mega-Glest
-!define APVER_OLD 3.6.0.3
-!define APVER_UPDATE 3.7.0-beta2
+!define APVER_OLD 3.6.0.3
+!define APVER_UPDATE 3.7.0-beta2
 
 Name "${APNAME} ${APVER_UPDATE}"
 SetCompressor /FINAL /SOLID lzma
@@ -174,7 +174,6 @@ Section "${APNAME} (required)"
   ; Put file there
   File "..\..\..\data\glest_game\megaglest.exe"
   File "..\..\..\data\glest_game\megaglest_editor.exe"
-  File "..\..\..\data\glest_game\megaglest_configurator.exe"
   File "..\..\..\data\glest_game\megaglest_g3dviewer.exe"
   File "..\..\..\data\glest_game\7z.exe"
   File "..\..\..\data\glest_game\7z.dll"
@@ -199,7 +198,6 @@ Section "Start Menu Shortcuts"
   CreateShortCut "$SMPROGRAMS\${APNAME}\Uninstall.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0
   CreateShortCut "$SMPROGRAMS\${APNAME}\${APNAME}.lnk" "$INSTDIR\megaglest.exe" "" "$INSTDIR\megaglest.exe" 0 "" "" "${APNAME}"
 
-;  CreateShortCut "$SMPROGRAMS\${APNAME} ${APVER}\${APNAME} Configurator.lnk" "$INSTDIR\glest_configurator.exe" "" "$INSTDIR\glest_configurator.exe" 0 "" "" "${APNAME} Config Editor"
   CreateShortCut "$SMPROGRAMS\${APNAME}\${APNAME} Map Editor.lnk" "$INSTDIR\megaglest_editor.exe" "" "$INSTDIR\megaglest_editor.exe" 0 "" "" "${APNAME} MegaGlest Map Editor"
   CreateShortCut "$SMPROGRAMS\${APNAME}\${APNAME} G3D Viewer.lnk" "$INSTDIR\megaglest_g3dviewer.exe" "" "$INSTDIR\megaglest_g3dviewer.exe" 0 "" "" "${APNAME} MegaGlest G3D Viewer"
 
@@ -222,9 +220,7 @@ Section "Uninstall"
 
   Delete "$INSTDIR\megaglest.exe"
   Delete "$INSTDIR\megaglest_editor.exe"
-  Delete "$INSTDIR\megaglest_configurator.exe"
   Delete "$INSTDIR\megaglest_g3dviewer.exe"
-  Delete "$INSTDIR\configuration.xml"
   Delete "$INSTDIR\megaglest.ico"
   Delete "$INSTDIR\glest.ini"
   Delete "$INSTDIR\glestkeys.ini"
diff --git a/source/shared_lib/CMakeLists.txt b/source/shared_lib/CMakeLists.txt
index e49ef576..073fd992 100644
--- a/source/shared_lib/CMakeLists.txt
+++ b/source/shared_lib/CMakeLists.txt
@@ -12,7 +12,7 @@ ENDIF()
 SET(EXTERNAL_LIBS "")
 SET(TARGET_NAME "libmegaglest")
 
-IF(BUILD_MEGAGLEST_MODEL_VIEWER OR BUILD_MEGAGLEST_MAP_EDITOR OR BUILD_MEGAGLEST_CONFIGURATOR OR BUILD_MEGAGLEST)
+IF(BUILD_MEGAGLEST_MODEL_VIEWER OR BUILD_MEGAGLEST_MAP_EDITOR OR BUILD_MEGAGLEST)
 	MESSAGE(STATUS "Will try to build MegaGlest shared library")
 
 	INCLUDE (CheckIncludeFiles)