diff --git a/lib/CodeGen/MachineBasicBlock.cpp b/lib/CodeGen/MachineBasicBlock.cpp
index 43ac49bd777..462c5626596 100644
--- a/lib/CodeGen/MachineBasicBlock.cpp
+++ b/lib/CodeGen/MachineBasicBlock.cpp
@@ -101,7 +101,8 @@ void MachineBasicBlock::print(std::ostream &OS) const
   }
     const BasicBlock *LBB = getBasicBlock();
     if(LBB)
-      OS << "\n" << LBB->getName() << " (" << (const void*)LBB << "):\n";
+      OS << "\n" << LBB->getName() << " (" << (const void*)this
+         << ", LLVM BB @" << (const void*) LBB << "):\n";
     for (const_iterator I = begin(); I != end(); ++I) {
         OS << "\t";
         I->print(OS, getParent()->getTarget());
diff --git a/lib/CodeGen/MachineInstr.cpp b/lib/CodeGen/MachineInstr.cpp
index a75c5795b17..f1a5c3ec525 100644
--- a/lib/CodeGen/MachineInstr.cpp
+++ b/lib/CodeGen/MachineInstr.cpp
@@ -289,9 +289,9 @@ static void print(const MachineOperand &MO, std::ostream &OS,
     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 @@ std::ostream &operator<<(std::ostream &OS, const MachineOperand &MO) {
         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() << ">";