diff --git a/configure b/configure
index 609a9c28988..86c969814d4 100755
--- a/configure
+++ b/configure
@@ -12285,6 +12285,56 @@ $as_echo "$ac_cv_cflags__Wwrite_strings" >&6; }
 if test $ac_cv_cflags__Wwrite_strings = yes; then :
   EXTRACFLAGS="$EXTRACFLAGS -Wwrite-strings"
 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
+else
+  ac_wine_try_cflags_saved=$CFLAGS
+CFLAGS="$CFLAGS -gdwarf-2"
+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__gdwarf_2=yes
+else
+  ac_cv_cflags__gdwarf_2=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__gdwarf_2" >&5
+$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_n "checking whether the compiler supports -gstrict-dwarf... " >&6; }
+if ${ac_cv_cflags__gstrict_dwarf+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_wine_try_cflags_saved=$CFLAGS
+CFLAGS="$CFLAGS -gstrict-dwarf"
+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__gstrict_dwarf=yes
+else
+  ac_cv_cflags__gstrict_dwarf=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__gstrict_dwarf" >&5
+$as_echo "$ac_cv_cflags__gstrict_dwarf" >&6; }
+if test $ac_cv_cflags__gstrict_dwarf = yes; then :
+  EXTRACFLAGS="$EXTRACFLAGS -gstrict-dwarf"
+fi
 
     case $host_cpu in
     *i[3456789]86*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fno-omit-frame-pointer" >&5
diff --git a/configure.ac b/configure.ac
index 4bd43d13c0e..c80fd8adbab 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1746,6 +1746,8 @@ then
   WINE_TRY_CFLAGS([-Wtype-limits])
   WINE_TRY_CFLAGS([-Wunused-but-set-parameter])
   WINE_TRY_CFLAGS([-Wwrite-strings])
+  WINE_TRY_CFLAGS([-gdwarf-2])
+  WINE_TRY_CFLAGS([-gstrict-dwarf])
 
   dnl gcc-4.6+ omits frame pointers by default, breaking some copy protections
   case $host_cpu in