diff --git a/include/llvm/Support/Dwarf.h b/include/llvm/Support/Dwarf.h
index b52914f9385..62dea0e917f 100644
--- a/include/llvm/Support/Dwarf.h
+++ b/include/llvm/Support/Dwarf.h
@@ -67,7 +67,7 @@ const uint64_t DW64_CIE_ID = UINT64_MAX;
 
 
 enum dwarf_constants {
-  DWARF_VERSION = 2,
+  DWARF_VERSION = 3,
 
   // Tags
   DW_TAG_array_type = 0x01,
diff --git a/test/DebugInfo/dwarf-version.ll b/test/DebugInfo/dwarf-version.ll
new file mode 100644
index 00000000000..4e00dee0018
--- /dev/null
+++ b/test/DebugInfo/dwarf-version.ll
@@ -0,0 +1,17 @@
+; RUN: llc -filetype=obj -O0 < %s > %t
+; RUN: llvm-dwarfdump -debug-dump=info %t | FileCheck %s
+
+; Test the version of debug info we say we're emitting.
+; CHECK: version = 0x0003
+
+@a = common global i32 0, align 4
+
+!llvm.dbg.cu = !{!0}
+
+!0 = metadata !{i32 786449, metadata !1, i32 12, metadata !"clang version 3.3 (trunk 179108) (llvm/trunk 179114)", i1 false, metadata !"", i32 0, metadata !2, metadata !2, metadata !2, metadata !3, metadata !""} ; [ DW_TAG_compile_unit ] [/usr/local/google/home/echristo/tmp/foo.c] [DW_LANG_C99]
+!1 = metadata !{metadata !"foo.c", metadata !"/usr/local/google/home/echristo/tmp"}
+!2 = metadata !{i32 0}
+!3 = metadata !{metadata !4}
+!4 = metadata !{i32 786484, i32 0, null, metadata !"a", metadata !"a", metadata !"", metadata !5, i32 1, metadata !6, i32 0, i32 1, i32* @a, null} ; [ DW_TAG_variable ] [a] [line 1] [def]
+!5 = metadata !{i32 786473, metadata !1}          ; [ DW_TAG_file_type ] [/usr/local/google/home/echristo/tmp/foo.c]
+!6 = metadata !{i32 786468, null, null, metadata !"int", i32 0, i64 32, i64 32, i64 0, i32 0, i32 5} ; [ DW_TAG_base_type ] [int] [line 0, size 32, align 32, offset 0, enc DW_ATE_signed]