diff --git a/lib/Target/PowerPC/PPCAsmPrinter.cpp b/lib/Target/PowerPC/PPCAsmPrinter.cpp
index 9cf686353a6..717b831086d 100644
--- a/lib/Target/PowerPC/PPCAsmPrinter.cpp
+++ b/lib/Target/PowerPC/PPCAsmPrinter.cpp
@@ -189,7 +189,14 @@ namespace {
       O << ')';
     }
     void printMemRegReg(const MachineInstr *MI, unsigned OpNo) {
-      printOperand(MI, OpNo);
+      // When used as the base register, r0 reads constant zero rather than
+      // the value contained in the register.  For this reason, the darwin
+      // assembler requires that we print r0 as 0 (no r) when used as the base.
+      const MachineOperand &MO = MI->getOperand(OpNo);
+      if (MO.getReg() == PPC::R0)
+        O << '0';
+      else
+        O << TM.getRegisterInfo()->get(MO.getReg()).Name;
       O << ", ";
       printOperand(MI, OpNo+1);
     }
diff --git a/lib/Target/PowerPC/PPCISelDAGToDAG.cpp b/lib/Target/PowerPC/PPCISelDAGToDAG.cpp
index b9550f50fa4..338be660808 100644
--- a/lib/Target/PowerPC/PPCISelDAGToDAG.cpp
+++ b/lib/Target/PowerPC/PPCISelDAGToDAG.cpp
@@ -454,8 +454,7 @@ bool PPCDAGToDAGISel::SelectAddrIdx(SDOperand N, SDOperand &Base,
     return true;
   }
  
-  // FIXME: This should be a CopyFromReg R0 rather than a load of 0.
-  Base = CurDAG->getTargetNode(PPC::LI, MVT::i32, getI32Imm(0));
+  Base = CurDAG->getRegister(PPC::R0, MVT::i32);
   Index = Select(N);
   return true;
 }
@@ -470,8 +469,7 @@ bool PPCDAGToDAGISel::SelectAddrIdxOnly(SDOperand N, SDOperand &Base,
     return true;
   }
   
-  // FIXME: This should be a CopyFromReg R0 rather than a load of 0.
-  Base = CurDAG->getTargetNode(PPC::LI, MVT::i32, getI32Imm(0));
+  Base = CurDAG->getRegister(PPC::R0, MVT::i32);
   Index = Select(N);
   return true;
 }