diff --git a/lib/AsmParser/LLLexer.cpp b/lib/AsmParser/LLLexer.cpp
index 23d7f19bbce..315048c748a 100644
--- a/lib/AsmParser/LLLexer.cpp
+++ b/lib/AsmParser/LLLexer.cpp
@@ -530,6 +530,7 @@ lltok::Kind LLLexer::LexIdentifier() {
   KEYWORD(asm);
   KEYWORD(sideeffect);
   KEYWORD(gc);
+  KEYWORD(dbg);
 
   KEYWORD(ccc);
   KEYWORD(fastcc);
diff --git a/lib/AsmParser/LLParser.cpp b/lib/AsmParser/LLParser.cpp
index b7b95d7ecf0..3c125a01b19 100644
--- a/lib/AsmParser/LLParser.cpp
+++ b/lib/AsmParser/LLParser.cpp
@@ -2624,6 +2624,23 @@ bool LLParser::ParseBasicBlock(PerFunctionState &PFS) {
     
     if (ParseInstruction(Inst, BB, PFS)) return true;
     
+    // Parse optional debug info
+    if (Lex.getKind() == lltok::comma) {
+      Lex.Lex();
+      if (Lex.getKind() == lltok::kw_dbg) {
+	Lex.Lex();
+	if (Lex.getKind() != lltok::Metadata)
+	  return TokError("Expected '!' here");
+	Lex.Lex();
+	MetadataBase *N = 0;
+	if (ParseMDNode(N)) return true;
+	Metadata &TheMetadata = M->getContext().getMetadata();
+	unsigned MDDbgKind = TheMetadata.getMDKind("dbg");
+	if (!MDDbgKind)
+	  MDDbgKind = TheMetadata.RegisterMDKind("dbg");
+	TheMetadata.setMD(MDDbgKind, cast<MDNode>(N), Inst);
+      }
+    }
     BB->getInstList().push_back(Inst);
 
     // Set the name on the instruction.
diff --git a/lib/AsmParser/LLToken.h b/lib/AsmParser/LLToken.h
index b053cca18a7..dd6359a630b 100644
--- a/lib/AsmParser/LLToken.h
+++ b/lib/AsmParser/LLToken.h
@@ -63,6 +63,7 @@ namespace lltok {
     kw_asm,
     kw_sideeffect,
     kw_gc,
+    kw_dbg,
     kw_c,
 
     kw_cc, kw_ccc, kw_fastcc, kw_coldcc,