diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index 27e2915399..9ebf3e3bd5 100644
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,6 +1,7 @@
 Thu Apr 17 02:25:11 1997  Doug Evans  <dje@canuck.cygnus.com>
 
 	* sim-options.c, sim-options.h: New files.
+	* sim-config.h (WITH_DEBUG): Provide default value of zero.
 
 	* run.c (main): Check return value of sim_open.
 
diff --git a/sim/common/sim-config.h b/sim/common/sim-config.h
index 1205920ab8..7278b3ba60 100644
--- a/sim/common/sim-config.h
+++ b/sim/common/sim-config.h
@@ -416,7 +416,13 @@ extern int current_floating_point;
 
 /* Debugging:
 
-   Control the inclusion of debugging code. */
+   Control the inclusion of debugging code.
+   Debugging is only turned on in rare circumstances [say during development]
+   and is not intended to be turned on otherwise.  */
+
+#ifndef WITH_DEBUG
+#define WITH_DEBUG			0
+#endif
 
 /* Include the tracing code.  Disabling this eliminates all tracing
    code */