diff --git a/SConstruct b/SConstruct
index 6bd2bbf986..7885c131b4 100644
--- a/SConstruct
+++ b/SConstruct
@@ -173,6 +173,8 @@ for p in platform_list:
 	env.Append(CCFLAGS=string.split(str(CCFLAGS)))
 	detect.configure(env)
 	env['platform'] = p
+        if not env.has_key('platform_libsuffix'):
+                env['platform_libsuffix'] = env['LIBSUFFIX']
 	sys.path.remove("./platform/"+p)
 	sys.modules.pop('detect')
 
diff --git a/core/SCsub b/core/SCsub
index 3d7eef0700..9a86c2943d 100644
--- a/core/SCsub
+++ b/core/SCsub
@@ -32,7 +32,7 @@ SConscript('math/SCsub');
 SConscript('io/SCsub');
 SConscript('bind/SCsub');
 
-lib = env.Library("core",env.core_sources)
+lib = env.Library("core",env.core_sources, LIBSUFFIX=env['platform_libsuffix'])
 
 env.Prepend(LIBS=[lib])
 
diff --git a/drivers/SCsub b/drivers/SCsub
index bd339dedb5..ca1b885028 100644
--- a/drivers/SCsub
+++ b/drivers/SCsub
@@ -75,7 +75,7 @@ if len(list) > 0:
 
 drivers_base=[]
 env.add_source_files(drivers_base,"*.cpp")
-lib_list.insert(0, env.Library("drivers", drivers_base))
+lib_list.insert(0, env.Library("drivers", drivers_base, LIBSUFFIX=env['platform_libsuffix']))
 
 env.Prepend(LIBS=lib_list)
 
diff --git a/main/SCsub b/main/SCsub
index 795c427c8d..7b51b06187 100644
--- a/main/SCsub
+++ b/main/SCsub
@@ -5,7 +5,7 @@ env.add_source_files(env.main_sources,"*.cpp")
 
 Export('env')
 
-lib = env.Library("main",env.main_sources)
+lib = env.Library("main",env.main_sources, LIBSUFFIX=env['platform_libsuffix'])
 
 env.Prepend(LIBS=[lib])
 
diff --git a/modules/SCsub b/modules/SCsub
index 811bc5e2aa..2cd2eeae83 100644
--- a/modules/SCsub
+++ b/modules/SCsub
@@ -17,7 +17,7 @@ for x in env.module_list:
 	env_modules.Append(CPPFLAGS=["-DMODULE_"+x.upper()+"_ENABLED"])
 	SConscript(x+"/SCsub")
 
-lib = env_modules.Library("modules",env.modules_sources)
+lib = env_modules.Library("modules",env.modules_sources, LIBSUFFIX=env['platform_libsuffix'])
 
 env.Prepend(LIBS=[lib])
 
diff --git a/platform/windows/detect.py b/platform/windows/detect.py
index b8b0509da7..a94e43fc85 100644
--- a/platform/windows/detect.py
+++ b/platform/windows/detect.py
@@ -66,7 +66,9 @@ def configure(env):
 	if (env["tools"]=="no"):
 		#no tools suffix
 		env['OBJSUFFIX'] = ".nt"+env['OBJSUFFIX']
-		env['LIBSUFFIX'] = ".nt"+env['LIBSUFFIX']
+		#env['LIBSUFFIX'] = ".nt"+env['LIBSUFFIX']
+		env['platform_libsuffix'] = ".nt"+env['LIBSUFFIX']
+
 
 
 	if (os.name=="nt" and os.getenv("VSINSTALLDIR")!=None):
diff --git a/platform/x11/SCsub b/platform/x11/SCsub
index 0644ba52ec..7a6f02daa5 100644
--- a/platform/x11/SCsub
+++ b/platform/x11/SCsub
@@ -7,7 +7,4 @@ common_x11=[\
 	"key_mapping_x11.cpp",\
 ]
 
-if env["target"]=="release":
-	env.Program('#bin/godot_rel',['godot_x11.cpp']+common_x11)
-else:
-	env.Program('#bin/godot',['godot_x11.cpp']+common_x11)
+env.Program('#bin/godot',['godot_x11.cpp']+common_x11)
diff --git a/scene/SCsub b/scene/SCsub
index 8c4f0499c4..28fb358106 100644
--- a/scene/SCsub
+++ b/scene/SCsub
@@ -15,7 +15,7 @@ SConscript('resources/SCsub');
 SConscript('io/SCsub');
 
 
-lib = env.Library("scene",env.scene_sources)
+lib = env.Library("scene",env.scene_sources, LIBSUFFIX=env['platform_libsuffix'])
 
 env.Prepend(LIBS=[lib])
 
diff --git a/script/SCsub b/script/SCsub
index 05c08ee8e7..7093dee36d 100644
--- a/script/SCsub
+++ b/script/SCsub
@@ -9,7 +9,7 @@ if (env["gdscript"]=="yes"):
 	SConscript('gdscript/SCsub');
 SConscript('multiscript/SCsub');
 
-lib = env.Library("script",env.script_sources)
+lib = env.Library("script",env.script_sources, LIBSUFFIX=env['platform_libsuffix'])
 
 env.Prepend(LIBS=[lib])
 
diff --git a/servers/SCsub b/servers/SCsub
index 3871c30cfa..1a858533b7 100644
--- a/servers/SCsub
+++ b/servers/SCsub
@@ -12,7 +12,7 @@ SConscript('audio/SCsub');
 SConscript('spatial_sound/SCsub');
 SConscript('spatial_sound_2d/SCsub');
 
-lib = env.Library("servers",env.servers_sources)
+lib = env.Library("servers",env.servers_sources, LIBSUFFIX=env['platform_libsuffix'])
 
 env.Prepend(LIBS=[lib])
 
diff --git a/tools/SCsub b/tools/SCsub
index bb05164fe0..4f1432143b 100644
--- a/tools/SCsub
+++ b/tools/SCsub
@@ -12,7 +12,7 @@ SConscript('docdump/SCsub');
 SConscript('freetype/SCsub');
 SConscript('doc/SCsub');
 
-lib = env.Library("tool",env.tool_sources)
+lib = env.Library("tool",env.tool_sources, LIBSUFFIX=env['platform_libsuffix'])
 
 env.Prepend(LIBS=[lib])