diff --git a/man/pike.1 b/man/pike.1
index 9f3bb5fa2cfea34c75bdeb0d512997c580e0ba4f..a0317a2894c2d130a77a9f251c2579c546096927 100644
--- a/man/pike.1
+++ b/man/pike.1
@@ -1,11 +1,11 @@
-.\" $Id: pike.1,v 1.26 2008/07/31 18:02:28 mast Exp $
+.\" $Id: pike.1,v 1.27 2008/07/31 18:13:17 mast Exp $
 .\" name section last-modified title section-name product/status architecture
 .ds ]L Pike
-.TH pike 1 "$Date: 2008/07/31 18:02:28 $" Pike "Pike Manual" Pike
-.\" On Solaris ]L will contain "Last modified $Date: 2008/07/31 18:02:28 $"
+.TH pike 1 "$Date: 2008/07/31 18:13:17 $" Pike "Pike Manual" Pike
+.\" On Solaris ]L will contain "Last modified $Date: 2008/07/31 18:13:17 $"
 .\" while HPUX uses ]L to contain "Pike".
 .\" On OSF/1 ]L will already contain the wanted string.
-.if !\*(]LPike .ds ]L $Date: 2008/07/31 18:02:28 $ \" Solaris nroff
+.if !\*(]LPike .ds ]L $Date: 2008/07/31 18:13:17 $ \" Solaris nroff
 .\" Major (mj) and minor (mn) version of Pike
 .nr mj 7
 .nr mn 7
@@ -70,6 +70,19 @@ Turn off tail recursion optimization (debug).
 .B \-dT
 Enable extra checks in the thread library, e.g. mutex sanity checks (debug).
 .TP
+.B \-dL
+.B Windows only:
+Enable Windows error dialogs when dll files cannot be loaded.
+
+It is common that Pike has modules which are linked to dll files that
+are not available in all installations. Therefore these error dialogs
+are disabled by default so that Pike does not hang on them when
+attempting to load certain modules.
+
+However, the error dialogs are the only way to see which dll's that
+could not be loaded, so this option may be necessary to find out why a
+certain module does not load.
+.TP
 .B \-l
 Increase the debug level of the global optimizer with 1 (debug).
 .TP
@@ -119,19 +132,6 @@ Turn on runtime checking of arguments to function calls, and soft casts.
 Turn on
 .B #pragma strict_types
 for all files.
-.TP
-.B \-rl
-.B Windows only:
-Enable Windows error dialogs when dll files cannot be loaded.
-
-It is common that Pike has modules which are linked to dll files that
-are not available in all installations. Therefore these error dialogs
-are disabled by default so that Pike does not hang on them when
-attempting to load certain modules.
-
-However, the error dialogs are the only way to see which dll's that
-could not be loaded, so this option may be necessary to find out why a
-certain module does not load.
 .LP
 The following options are supported by the default master program:
 .TP
diff --git a/src/main.c b/src/main.c
index 8438dc72d35d95bbeb35536a965c325df182e93b..37c2d2451f33fe4a4540f04bac367dc08b3de316 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.233 2008/07/31 18:03:01 mast Exp $
+|| $Id: main.c,v 1.234 2008/07/31 18:13:17 mast Exp $
 */
 
 #include "global.h"
@@ -447,6 +447,12 @@ int main(int argc, char **argv)
 	      p++;
 	      goto more_d_flags;
 
+	    case 'L':
+	      set_pike_debug_options (WINDOWS_ERROR_DIALOGS,
+				      WINDOWS_ERROR_DIALOGS);
+	      p++;
+	      goto more_d_flags;
+
 	    default:
 	      d_flag += (p[0] == 'd');
 	      p++;
@@ -468,12 +474,6 @@ int main(int argc, char **argv)
 	    p++;
 	    goto more_r_flags;
 
-	  case 'l':
-	    set_pike_runtime_options (RUNTIME_ERROR_DIALOGS,
-				      RUNTIME_ERROR_DIALOGS);
-	    p++;
-	    goto more_r_flags;
-
          default:
             p++;
 	    break;
@@ -546,7 +546,7 @@ int main(int argc, char **argv)
     set_pike_debug_options(ERRORCHECK_MUTEXES, ERRORCHECK_MUTEXES);
 
 #ifdef HAVE_SETERRORMODE
-  if (!(runtime_options & RUNTIME_ERROR_DIALOGS)) {
+  if (!(debug_options & WINDOWS_ERROR_DIALOGS)) {
     /* This avoids popups when LoadLibrary fails to find a dll.
      *
      * Note that the popup is the _only_ way to see which dll (loaded
diff --git a/src/pike_embed.h b/src/pike_embed.h
index 243a23f48f9976a319c74c9c24a911318e55705b..fb6b8b48e2fa153da0691fe5dbce098ee5393bd1 100644
--- a/src/pike_embed.h
+++ b/src/pike_embed.h
@@ -1,5 +1,5 @@
 /*
- * $Id: pike_embed.h,v 1.11 2008/07/31 18:01:49 mast Exp $
+ * $Id: pike_embed.h,v 1.12 2008/07/31 18:13:17 mast Exp $
  *
  * Pike embedding API.
  *
@@ -24,18 +24,18 @@ extern int yydebug;
 #endif /* YYDEBUG || PIKE_DEBUG */
 
 /* Debug options */
-#define DEBUG_SIGNALS 1
-#define NO_TAILRECURSION 2
-#define NO_PEEP_OPTIMIZING 4
-#define GC_RESET_DMALLOC 8
-#define ERRORCHECK_MUTEXES 16
+#define DEBUG_SIGNALS		0x0001
+#define NO_TAILRECURSION	0x0002
+#define NO_PEEP_OPTIMIZING	0x0004
+#define GC_RESET_DMALLOC	0x0008
+#define ERRORCHECK_MUTEXES	0x0010
+#define WINDOWS_ERROR_DIALOGS	0x0020
 
 int set_pike_debug_options(int bits, int mask);
 
 /* Runtime options */
 #define RUNTIME_CHECK_TYPES	1
 #define RUNTIME_STRICT_TYPES	2
-#define RUNTIME_ERROR_DIALOGS	4
 
 int set_pike_runtime_options(int bits, int mask);