diff --git a/llvm/lib/Target/PowerPC/PowerPC.h b/llvm/lib/Target/PowerPC/PowerPC.h
index 2f2b990f1e53..002132873dd5 100644
--- a/llvm/lib/Target/PowerPC/PowerPC.h
+++ b/llvm/lib/Target/PowerPC/PowerPC.h
@@ -24,8 +24,9 @@ class TargetMachine;
 
 // Here is where you would define factory methods for powerpc-specific
 // passes. For example:
-FunctionPass *createPPCSimpleInstructionSelector (TargetMachine &TM);
+FunctionPass *createPPCSimpleInstructionSelector(TargetMachine &TM);
 FunctionPass *createPPCCodePrinterPass(std::ostream &OS, TargetMachine &TM);
+FunctionPass *createPPCBranchSelectionPass();
 } // end namespace llvm;
 
 // Defines symbolic names for PowerPC registers.  This defines a mapping from
diff --git a/llvm/lib/Target/PowerPC/PowerPCBranchSelector.cpp b/llvm/lib/Target/PowerPC/PowerPCBranchSelector.cpp
new file mode 100644
index 000000000000..dbc4b7de4899
--- /dev/null
+++ b/llvm/lib/Target/PowerPC/PowerPCBranchSelector.cpp
@@ -0,0 +1,142 @@
+//===-- PowerPCBranchSelector.cpp - Emit long conditional branches-*- C++ -*-=//
+// 
+//                     The LLVM Compiler Infrastructure
+//
+// This file was developed by Nate Baegeman and is distributed under the
+// University of Illinois Open Source License. See LICENSE.TXT for details.
+// 
+//===----------------------------------------------------------------------===//
+//
+// This file contains a pass that scans a machine function to determine which 
+// conditional branches need more than 16 bits of displacement to reach their
+// target basic block.  It does this in two passes; a calculation of basic block
+// positions pass, and a branch psuedo op to machine branch opcode pass.  This
+// pass should be run last, just before the assembly printer.
+//
+//===----------------------------------------------------------------------===//
+
+#define DEBUG_TYPE "bsel"
+#include "PowerPC.h"
+#include "PowerPCInstrBuilder.h"
+#include "PowerPCInstrInfo.h"
+#include "llvm/CodeGen/MachineFunctionPass.h"
+#include "llvm/CodeGen/MachineFunction.h"
+#include "Support/Debug.h"
+#include <map>
+using namespace llvm;
+
+namespace {
+  struct BSel : public MachineFunctionPass {
+    // OffsetMap - Mapping between BB and byte offset from start of function
+    std::map<MachineBasicBlock*, unsigned> OffsetMap;
+
+    /// bytesForOpcode - A convenience function for totalling up the number of 
+    /// bytes in a basic block.
+    ///
+    static unsigned bytesForOpcode(unsigned opcode) {
+      switch (opcode) {
+      case PPC32::COND_BRANCH:
+        // while this will be 4 most of the time, if we emit 12 it is just a
+        // minor pessimization that saves us from having to worry about 
+        // keeping the offsets up to date later when we emit long branch glue.
+        return 12;
+      case PPC32::MovePCtoLR:
+        // MovePCtoLR is actually a combination of a branch-and-link (bl)
+        // followed by a move from link register to dest reg (mflr)
+        return 8;
+        break;
+      case PPC32::IMPLICIT_DEF: // no asm emitted
+        return 0;
+        break;
+      default: 
+        return 4; // PowerPC instructions are all 4 bytes
+        break;
+      }
+    }
+    
+    virtual bool runOnMachineFunction(MachineFunction &Fn) {
+      // Running total of instructions encountered since beginning of function
+      unsigned ByteCount = 0;
+
+      // For each MBB, add its offset to the offset map, and count up its
+      // instructions
+      for (MachineFunction::iterator MFI = Fn.begin(), E = Fn.end(); MFI != E; 
+           ++MFI) {
+        MachineBasicBlock *MBB = MFI;
+        OffsetMap[MBB] = ByteCount;
+
+        for (MachineBasicBlock::iterator MBBI = MBB->begin(), EE = MBB->end();
+             MBBI != EE; ++MBBI)
+          ByteCount += bytesForOpcode(MBBI->getOpcode());
+      }
+
+      // We're about to run over the MBB's again, so reset the ByteCount
+      ByteCount = 0;
+
+      // For each MBB, find the conditional branch pseudo instructions, and
+      // calculate the difference between the target MBB and the current ICount
+      // to decide whether or not to emit a short or long branch.
+      //
+      // short branch:
+      // bCC .L_TARGET_MBB
+      //
+      // long branch:
+      // bInverseCC $PC+8
+      // b .L_TARGET_MBB
+      // b .L_FALLTHROUGH_MBB
+
+      for (MachineFunction::iterator MFI = Fn.begin(), E = Fn.end(); MFI != E; 
+           ++MFI) {
+        MachineBasicBlock *MBB = MFI;
+        
+        for (MachineBasicBlock::iterator MBBI = MBB->begin(), EE = MBB->end();
+             MBBI != EE; ++MBBI) {
+          if (MBBI->getOpcode() == PPC32::COND_BRANCH) {
+            // condbranch operands:
+            // 0. CR0 register
+            // 1. bc opcode
+            // 2. target MBB
+            // 3. fallthrough MBB
+            MachineBasicBlock *trueMBB = 
+              MBBI->getOperand(2).getMachineBasicBlock();
+            MachineBasicBlock *falseMBB = 
+              MBBI->getOperand(3).getMachineBasicBlock();
+            
+            int Displacement = OffsetMap[trueMBB] - ByteCount;
+            unsigned Opcode = MBBI->getOperand(1).getImmedValue();
+            unsigned Inverted = PowerPCInstrInfo::invertPPCBranchOpcode(Opcode);
+
+            MachineInstr *MI = MBBI;
+            if (Displacement >= -32768 && Displacement <= 32767) {
+              BuildMI(*MBB, MBBI, Opcode, 2).addReg(PPC32::CR0).addMBB(trueMBB);
+            } else {
+              BuildMI(*MBB, MBBI, Inverted, 2).addReg(PPC32::CR0).addSImm(8);
+              BuildMI(*MBB, MBBI, PPC32::B, 1).addMBB(trueMBB);
+              BuildMI(*MBB, MBBI, PPC32::B, 1).addMBB(falseMBB);
+
+              // Let the byte tracker know that we just added 8 bytes worth of
+              // branches in addition to the original branch instruction.
+              ByteCount += 8;
+            }
+            MBB->erase(MI);
+          }
+          ByteCount += bytesForOpcode(MBBI->getOpcode());
+        }
+      }
+
+      OffsetMap.clear();
+      return true;
+    }
+
+    virtual const char *getPassName() const {
+      return "PowerPC Branch Selection";
+    }
+  };
+}
+
+/// createPPCBranchSelectionPass - returns an instance of the Branch Selection
+/// Pass
+///
+FunctionPass *llvm::createPPCBranchSelectionPass() {
+  return new BSel();
+}