diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 5d49bc2d9..a0f175d9b 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,5 +1,9 @@
 D1X-Rebirth Changelog
 
+20120728
+--------
+SConstruct, main/vers_id.h: Some Sconstruct lovin': Respect LDFLAGS; Made D1XMAJORi/MINORi/MICROi compile time constants; Do not pass CFLAGS to CXX; Mark some more warnings as errors - patches by Kp
+
 20120724
 --------
 main/bmread.c: No calling piggy_dump_all() when EDITOR is defined, it causes a failed Assert and causes it to exit when the PC Shareware descent.pig is used
diff --git a/SConstruct b/SConstruct
index f1a6e620b..95da0dde0 100644
--- a/SConstruct
+++ b/SConstruct
@@ -272,8 +272,8 @@ if (verbosebuild == 0):
 	env["RANLIBCOMSTR"] = "Indexing $TARGET ..."
 
 # Flags and stuff for all platforms...
-env.Append(CPPFLAGS = ['-Wall', '-funsigned-char', '-std=c99', '-pedantic'])
-env.Append(CPPDEFINES = [('PROGRAM_NAME', '\\"' + str(PROGRAM_NAME) + '\\"'), ('D1XMAJOR', '\\"' + str(D1XMAJOR) + '\\"'), ('D1XMINOR', '\\"' + str(D1XMINOR) + '\\"'), ('D1XMICRO', '\\"' + str(D1XMICRO) + '\\"')])
+env.Append(CPPFLAGS = ['-Wall', '-funsigned-char', '-Werror=implicit-int', '-Werror=implicit-function-declaration', '-std=c99', '-pedantic'])
+env.Append(CPPDEFINES = [('PROGRAM_NAME', '\\"' + str(PROGRAM_NAME) + '\\"'), ('D1XMAJORi', str(D1XMAJOR)), ('D1XMINORi', str(D1XMINOR)), ('D1XMICROi', str(D1XMICRO))])
 env.Append(CPPDEFINES = ['NETWORK', '_REENTRANT'])
 env.Append(CPPPATH = ['include', 'main', 'arch/include'])
 libs = ['physfs', 'm']
@@ -282,7 +282,7 @@ libs = ['physfs', 'm']
 if os.environ.has_key('CC'):
 	env['CC'] = os.environ['CC']
 if os.environ.has_key('CFLAGS'):
-	env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS'])
+	env['CFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS'])
 if os.environ.has_key('CXX'):
 	env['CXX'] = os.environ['CXX']
 if os.environ.has_key('CXXFLAGS'):
@@ -343,7 +343,7 @@ else:
 		ogllibs = ['GLES_CM', 'EGL']
 	else:
 		ogllibs = ['GL', 'GLU']
-	lflags = '-L/usr/X11R6/lib'
+	lflags = os.environ["LDFLAGS"] if os.environ.has_key('LDFLAGS') else ''
 
 # set endianess
 if (checkEndian() == "big"):
diff --git a/main/vers_id.h b/main/vers_id.h
index cc1601e29..6ed3e226b 100644
--- a/main/vers_id.h
+++ b/main/vers_id.h
@@ -3,12 +3,15 @@
 #ifndef _VERS_ID
 #define _VERS_ID
 
++#define __stringize2(X)	#X
++#define __stringize(X)	__stringize2(X)
++
++#define D1XMAJOR __stringize(D1XMAJORi)
++#define D1XMINOR __stringize(D1XMINORi)
++#define D1XMICRO __stringize(D1XMICROi)
+
 #define BASED_VERSION "Registered v1.5 Jan 5, 1996"
 #define VERSION D1XMAJOR "." D1XMINOR "." D1XMICRO
 #define DESCENT_VERSION "D1X-Rebirth v" VERSION
 
-#define D1XMAJORi atoi(D1XMAJOR)
-#define D1XMINORi atoi(D1XMINOR)
-#define D1XMICROi atoi(D1XMICRO)
-
 #endif /* _VERS_ID */