diff --git a/llvm/lib/CodeGen/MachineInstr.cpp b/llvm/lib/CodeGen/MachineInstr.cpp
index a75c579..f1a5c3e 100644
--- a/llvm/lib/CodeGen/MachineInstr.cpp
+++ b/llvm/lib/CodeGen/MachineInstr.cpp
@@ -289,9 +289,9 @@
     break;
   }
   case MachineOperand::MO_MachineBasicBlock:
-    OS << "bb<"
+    OS << "mbb<"
        << ((Value*)MO.getMachineBasicBlock()->getBasicBlock())->getName()
-       << "," << (void*)MO.getMachineBasicBlock()->getBasicBlock() << ">";
+       << "," << (void*)MO.getMachineBasicBlock() << ">";
     break;
   case MachineOperand::MO_FrameIndex:
     OS << "<fi#" << MO.getFrameIndex() << ">";
@@ -448,9 +448,9 @@
         break;
       }
     case MachineOperand::MO_MachineBasicBlock:
-      OS << "bb<"
+      OS << "<mbb:"
          << ((Value*)MO.getMachineBasicBlock()->getBasicBlock())->getName()
-         << "," << (void*)MO.getMachineBasicBlock()->getBasicBlock() << ">";
+         << "@" << (void*)MO.getMachineBasicBlock() << ">";
       break;
     case MachineOperand::MO_FrameIndex:
       OS << "<fi#" << MO.getFrameIndex() << ">";