diff --git a/configure b/configure
index ec66aa33d73..48d854bb2b4 100755
--- a/configure
+++ b/configure
@@ -12290,7 +12290,33 @@ fi
 
     for ac_flag in $CFLAGS; do
     case $ac_flag in
-      -g) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -gdwarf-2" >&5
+      -g) case $host_os in
+            darwin*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -gstabs+" >&5
+$as_echo_n "checking whether the compiler supports -gstabs+... " >&6; }
+if ${ac_cv_cflags__gstabsp+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_wine_try_cflags_saved=$CFLAGS
+CFLAGS="$CFLAGS -gstabs+"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+int main(int argc, char **argv) { return 0; }
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_cflags__gstabsp=yes
+else
+  ac_cv_cflags__gstabsp=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+CFLAGS=$ac_wine_try_cflags_saved
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__gstabsp" >&5
+$as_echo "$ac_cv_cflags__gstabsp" >&6; }
+if test $ac_cv_cflags__gstabsp = yes; then :
+  EXTRACFLAGS="$EXTRACFLAGS -gstabs+"
+fi ;;
+            *) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -gdwarf-2" >&5
 $as_echo_n "checking whether the compiler supports -gdwarf-2... " >&6; }
 if ${ac_cv_cflags__gdwarf_2+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -12315,7 +12341,7 @@ $as_echo "$ac_cv_cflags__gdwarf_2" >&6; }
 if test $ac_cv_cflags__gdwarf_2 = yes; then :
   EXTRACFLAGS="$EXTRACFLAGS -gdwarf-2"
 fi
-          { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -gstrict-dwarf" >&5
+               { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -gstrict-dwarf" >&5
 $as_echo_n "checking whether the compiler supports -gstrict-dwarf... " >&6; }
 if ${ac_cv_cflags__gstrict_dwarf+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -12340,6 +12366,7 @@ $as_echo "$ac_cv_cflags__gstrict_dwarf" >&6; }
 if test $ac_cv_cflags__gstrict_dwarf = yes; then :
   EXTRACFLAGS="$EXTRACFLAGS -gstrict-dwarf"
 fi ;;
+          esac ;;
     esac
   done
 
diff --git a/configure.ac b/configure.ac
index 528ee9069aa..9a152001014 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1749,11 +1749,14 @@ then
   WINE_TRY_CFLAGS([-Wunused-but-set-parameter])
   WINE_TRY_CFLAGS([-Wwrite-strings])
 
-  dnl Default to dwarf-2 debug info
+  dnl On Darwin, prefer stabs; everywhere else, default to dwarf-2 debug info
   for ac_flag in $CFLAGS; do
     case $ac_flag in
-      -g) WINE_TRY_CFLAGS([-gdwarf-2])
-          WINE_TRY_CFLAGS([-gstrict-dwarf]) ;;
+      -g) case $host_os in
+            darwin*) WINE_TRY_CFLAGS([-gstabs+]) ;;
+            *) WINE_TRY_CFLAGS([-gdwarf-2])
+               WINE_TRY_CFLAGS([-gstrict-dwarf]) ;;
+          esac ;;
     esac
   done