diff --git a/src/main.c b/src/main.c
index 011e4c7d913681df5415f65d8fc022c150f7946c..39d99c3dbba686e71203a9f59296a4eefb9ca495 100644
--- a/src/main.c
+++ b/src/main.c
@@ -2,7 +2,7 @@
 || This file is part of Pike. For copyright information see COPYRIGHT.
 || Pike is distributed under GPL, LGPL and MPL. See the file COPYING
 || for more information.
-|| $Id: main.c,v 1.226 2007/05/17 12:26:50 grubba Exp $
+|| $Id: main.c,v 1.227 2007/05/18 14:00:48 grubba Exp $
 */
 
 #include "global.h"
@@ -69,6 +69,10 @@
 /* Define this to trace the execution of main(). */
 /* #define TRACE_MAIN */
 
+#ifdef PIKE_EXTRA_DEBUG
+#define TRACE_MAIN
+#endif /* PIKE_EXTRA_DEBUG */
+
 #ifdef TRACE_MAIN
 #define TRACE(X)	fprintf X
 #else /* !TRACE_MAIN */
diff --git a/src/pike_embed.c b/src/pike_embed.c
index bf938f55997d3a4c35eed26204cea2d713e26fff..b8e2f42132b0fa2fde2d8c73ae228d4a3f9b2564 100644
--- a/src/pike_embed.c
+++ b/src/pike_embed.c
@@ -1,5 +1,5 @@
 /*
- * $Id: pike_embed.c,v 1.11 2007/05/13 14:55:26 mast Exp $
+ * $Id: pike_embed.c,v 1.12 2007/05/18 14:00:48 grubba Exp $
  *
  * Pike embedding API.
  *
@@ -83,6 +83,14 @@ int try_use_mmx;
 /* Define this to trace the execution of main(). */
 /* #define TRACE_MAIN */
 
+/* Define this for extra C-stack debug. */
+/* #define STACK_DEBUG */
+
+#ifdef PIKE_EXTRA_DEBUG
+#define TRACE_MAIN
+#define STACK_DEBUG
+#endif
+
 #ifdef TRACE_MAIN
 #define TRACE(X)	fprintf X
 #else /* !TRACE_MAIN */