diff --git a/dlls/setupapi/setupcab.c b/dlls/setupapi/setupcab.c
index ebc422302c2..6fc3001ca49 100644
--- a/dlls/setupapi/setupcab.c
+++ b/dlls/setupapi/setupcab.c
@@ -19,7 +19,7 @@
  *
  *
  * Many useful traces are commented in code, uncomment them if you have
- * trouble and run with --debugmsg +setupapi
+ * trouble and run with WINEDEBUG=+setupapi
  * 
  */
 
diff --git a/dlls/x11drv/keyboard.c b/dlls/x11drv/keyboard.c
index a31f0556e84..85a292b9ca2 100644
--- a/dlls/x11drv/keyboard.c
+++ b/dlls/x11drv/keyboard.c
@@ -185,7 +185,7 @@ static const WORD main_key_vkey_dvorak[MAIN_LEN] =
    and Shift-AltGr if it can vary among different X servers */
 /* Remember that your 102nd key (to the right of l-shift) should be on a
    separate line, see existing tables */
-/* If Wine fails to match your new table, use -debugmsg +key to find out why */
+/* If Wine fails to match your new table, use WINEDEBUG=+key to find out why */
 /* Remember to also add your new table to the layout index table far below! */
 
 /*** German Logitech Desktop Pro keyboard layout */
diff --git a/programs/winelauncher.in b/programs/winelauncher.in
index 402d1a35386..9f4851fdc1f 100755
--- a/programs/winelauncher.in
+++ b/programs/winelauncher.in
@@ -202,7 +202,7 @@ export WINESERVER
 
 info_flag=~/.wine/.no_prelaunch_window_flag
 debug_flag=~/.wine/.no_debug_window_flag
-debug_options="-debugmsg warn+all"
+debug_options="warn+all"
 
 if [ -f $info_flag ] ; then
     use_info_message=0
@@ -558,8 +558,8 @@ You may view this file by selecting View Log, below."
         #  If they want to retry with debug, let 'em.
         #------------------------------------------------------------------------------
         if [ $debug_return -eq 2 ] ; then
-            echo "Rerunning $0 $debug_options $@"
-            exec $0 $debug_options "$@"
+            echo "Rerunning WINEDEBUG=$debug_options $0 $@"
+            WINEDEBUG=$debug_options exec $0 "$@"
         fi
     done
 fi
diff --git a/windows/msgbox.c b/windows/msgbox.c
index 961e1f7f604..6d235c657f9 100644
--- a/windows/msgbox.c
+++ b/windows/msgbox.c
@@ -336,7 +336,7 @@ static INT_PTR CALLBACK MSGBOX_DlgProc( HWND hwnd, UINT message,
  *
  * NOTES
  *   The WARN is here to help debug erroneous MessageBoxes
- *   Use: -debugmsg warn+dialog,+relay
+ *   Use: WINEDEBUG=warn+dialog,+relay
  */
 INT WINAPI MessageBoxA(HWND hWnd, LPCSTR text, LPCSTR title, UINT type)
 {