4 files changed, 6 insertions, 4 deletions
diff --git a/erts/etc/common/erlexec.c b/erts/etc/common/erlexec.c
index c9908caf20..f098e56a2e 100644
--- a/erts/etc/common/erlexec.c
+++ b/erts/etc/common/erlexec.c
@@ -103,14 +103,16 @@ static char *plusM_other_switches[] = {
     "ea",
     "ummc",
     "uycs",
+    "usac",
     "im",
     "is",
     "it",
+    "lpm",
     "Mamcbf",
     "Mrmcbf",
     "Mmcs",
     "Mscs",
-    "Mscmgc",
+    "Mscrfsd",
     "Msco",
     "Mscrpm",
     "Ye",
diff --git a/erts/etc/unix/Install.src b/erts/etc/unix/Install.src
index 0f33258a28..8eb1db75bd 100644
--- a/erts/etc/unix/Install.src
+++ b/erts/etc/unix/Install.src
@@ -137,9 +137,9 @@ case $start_option in
 esac
 
 cp -p ../releases/%I_SYSTEM_VSN%/start_*.boot .
+cp -p ../releases/%I_SYSTEM_VSN%/no_dot_erlang.boot .
 cp -p $Name.boot start.boot
 cp -p ../releases/%I_SYSTEM_VSN%/$Name.script start.script
-
 #
 # Fixing the man pages
 #
diff --git a/erts/etc/unix/cerl.src b/erts/etc/unix/cerl.src
index 38c6dd037f..be8343e87e 100644
--- a/erts/etc/unix/cerl.src
+++ b/erts/etc/unix/cerl.src
@@ -346,7 +346,7 @@ elif [ "x$GDB" = "xegdb" ]; then
     case "x$core" in
 	x)
 	    # Get emu args to use from erlexec...
-	    beam_args=`$EXEC -emu_args_exit ${1+"$@"}`
+	    beam_args=`$EXEC -emu_args_exit ${1+"$@"} | tr '\n' ' '`
 	    gdbcmd="(insert-string \"set args $beam_args\") \
                     (comint-send-input)"
 	    ;;
diff --git a/erts/etc/win32/Install.c b/erts/etc/win32/Install.c
index dd02a9c111..c46bb89f7c 100644
--- a/erts/etc/win32/Install.c
+++ b/erts/etc/win32/Install.c
@@ -47,7 +47,7 @@ int main(int argc, char **argv)
     char *binaries[] = { "erl.exe", "werl.exe", "erlc.exe",
 			 "dialyzer.exe", "typer.exe",
 			 "escript.exe", "ct_run.exe", NULL };
-    char *scripts[] = { "start_clean.boot", "start_sasl.boot", NULL };
+    char *scripts[] = { "start_clean.boot", "start_sasl.boot", "no_dot_erlang.boot", NULL };
     char fromname[MAX_PATH];
     char toname[MAX_PATH];