diff --git a/thunderbird-mozconfig-debuginfo b/thunderbird-mozconfig-debuginfo
index a0ef07a..5fb7e30 100644
--- a/thunderbird-mozconfig-debuginfo
+++ b/thunderbird-mozconfig-debuginfo
@@ -1,5 +1,5 @@
 # For mozilla's debuginfo:
-export CFLAGS="-gstabs+"
-export CXXFLAGS="-gstabs+"
+export CFLAGS="-gdwarf-2"
+export CXXFLAGS="-gdwarf-2"
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-crashreporter
diff --git a/thunderbird.spec b/thunderbird.spec
index 071f6e6..9711252 100644
--- a/thunderbird.spec
+++ b/thunderbird.spec
@@ -23,7 +23,7 @@
 
 %define official_branding 1
 # enable crash reporter only for iX86
-%ifarch %{ix86}
+%ifarch %{ix86} x86_64
 %define enable_mozilla_crashreporter 1
 %else
 %define enable_mozilla_crashreporter 0