diff --git a/sc2/build/build.config b/sc2/build/build.config
index 492853c6d..a1f53d078 100644
--- a/sc2/build/build.config
+++ b/sc2/build/build.config
@@ -58,6 +58,7 @@ CHOICE_debug_OPTION_debug_TITLE="Debugging information"
 CHOICE_debug_OPTION_debug_ACTION='debug_action'
 debug_action() {
 	CFLAGS="$CFLAGS -g -O0 -W -Wall"
+	CFLAGS="$CFLAGS -DDEBUG_TRACK_SEM" # enable semaphore deugging
 	LDFLAGS="$LDFLAGS -O0"
 	DEBUG=1
 }
@@ -65,6 +66,7 @@ CHOICE_debug_OPTION_strictdebug_TITLE="Debug info + strict compile checks"
 CHOICE_debug_OPTION_strictdebug_ACTION='strictdebug_action'
 strictdebug_action() {
 	CFLAGS="$CFLAGS -O1"  # This is needed for -Wunitialized
+	CFLAGS="$CFLAGS -DDEBUG_TRACK_SEM" # enable semaphore deugging
 	CFLAGS="$CFLAGS -W -Wall \
 			-Wbad-function-cast -Wcast-qual -Wmissing-prototypes \
 			-Wstrict-prototypes -Wmissing-declarations \
diff --git a/sc2/src/msvc++/UrQuanMasters.dsp b/sc2/src/msvc++/UrQuanMasters.dsp
index 97c5ef541..5c4805717 100644
--- a/sc2/src/msvc++/UrQuanMasters.dsp
+++ b/sc2/src/msvc++/UrQuanMasters.dsp
@@ -66,7 +66,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I ".." /I "..\sc2code" /I "..\sc2code\libs" /I "..\sc2code\ships" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D _VW=320 /D _VH=240 /D "HAVE_OPENGL" /D "GFXMODULE_SDL" /D "HAVE_OPENAL" /D "SOUNDMODULE_SDL" /FR /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I ".." /I "..\sc2code" /I "..\sc2code\libs" /I "..\sc2code\ships" /D "_DEBUG" /D "DEBUG_TRACK_SEM" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D _VW=320 /D _VH=240 /D "HAVE_OPENGL" /D "GFXMODULE_SDL" /D "HAVE_OPENAL" /D "SOUNDMODULE_SDL" /FR /YX /FD /GZ /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
diff --git a/sc2/src/sc2code/libs/threadlib.h b/sc2/src/sc2code/libs/threadlib.h
index 6b9d14ef8..fc12fee62 100644
--- a/sc2/src/sc2code/libs/threadlib.h
+++ b/sc2/src/sc2code/libs/threadlib.h
@@ -21,7 +21,11 @@
 #define _THREADLIB_H
 
 #define THREADLIB SDL
+
+/*
+This is now a compile-time define
 #define DEBUG_TRACK_SEM
+*/
 
 #ifdef DEBUG
 #	ifndef DEBUG_THREADS