diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9648baa2055..5e319121cb4 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2011-12-28  Ian Lance Taylor  <iant@google.com>
+
+	* dwarf2out.c (gen_compile_unit_die): Use DW_LANG_Go for Go.
+
 2011-12-28  Michael Meissner  <meissner@linux.vnet.ibm.com>
 
 	PR target/51623
diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index 8de36137e33..850eb556217 100644
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -18433,6 +18433,11 @@ gen_compile_unit_die (const char *filename)
 	language = DW_LANG_ObjC;
       else if (strcmp (language_string, "GNU Objective-C++") == 0)
 	language = DW_LANG_ObjC_plus_plus;
+      else if (dwarf_version >= 5 || !dwarf_strict)
+	{
+	  if (strcmp (language_string, "GNU Go") == 0)
+	    language = DW_LANG_Go;
+	}
     }
 
   add_AT_unsigned (die, DW_AT_language, language);