diff --git a/sc2/ChangeLog b/sc2/ChangeLog
index 738860b2a..ee59e05cc 100644
--- a/sc2/ChangeLog
+++ b/sc2/ChangeLog
@@ -1,4 +1,5 @@
 Changes towards version 0.7:
+- Build with debug info in strict-debug mode (bug #1127), from Scott A. Colcord
 - Added spoken Slylandro probe coordinates (bug #732) - Nic, Alex
 - Added the missing bits to the no-voice versions of Mycon, Syreen and
   Utwig dialogue (bug #327) - Alex
diff --git a/sc2/build/unix/build.config b/sc2/build/unix/build.config
index 8bbec23d1..a5a4f9be6 100644
--- a/sc2/build/unix/build.config
+++ b/sc2/build/unix/build.config
@@ -151,7 +151,7 @@ uqm_prepare_config()
 				;;
 			*)
 				CFLAGS="$CFLAGS -O1"  # This is needed for -Wunitialized
-				CFLAGS="$CFLAGS -W -Wall \
+				CFLAGS="$CFLAGS -g -DDEBUG -W -Wall \
 						-Wbad-function-cast -Wcast-qual -Wmissing-prototypes \
 						-Wstrict-prototypes -Wmissing-declarations \
 						-Wwrite-strings -Wimplicit -Wreturn-type -Wformat \
@@ -179,6 +179,7 @@ uqm_prepare_config()
 				CFLAGS=`echo $CFLAGS`
 						# Remove all the unnecessary spaces from $CFLAGS,
 						# for more readable messages.
+				LDFLAGS="$LDFLAGS -O0"
 				;;
 		esac
 		DEBUG=1
diff --git a/sc2/doc/devel/versions b/sc2/doc/devel/versions
index 6763abf52..bcab2412a 100644
--- a/sc2/doc/devel/versions
+++ b/sc2/doc/devel/versions
@@ -39,4 +39,4 @@ Version 0.6.6: Revision 3143
 Version 0.6.7: Revision 3276
 Version 0.6.8: Revision 3334
 Version 0.6.9: Revision 3537
-Version 0.7.0-rc1: Revision 3574
+Version 0.7.0-rc2: Revision 3622