diff --git a/lib/CodeGen/SelectionDAG/FastISel.cpp b/lib/CodeGen/SelectionDAG/FastISel.cpp
index f3fcaec28c3..996cea0155c 100644
--- a/lib/CodeGen/SelectionDAG/FastISel.cpp
+++ b/lib/CodeGen/SelectionDAG/FastISel.cpp
@@ -36,6 +36,7 @@ bool FastISel::SelectBinaryOp(Instruction *I, ISD::NodeType ISDOpcode,
     // the given ISD opcode and type. Halt "fast" selection and bail.
     return false;
 
+  // We successfully emitted code for the given LLVM Instruction.
   ValueMap[I] = ResultReg;
   return true;
 }
@@ -53,12 +54,18 @@ FastISel::SelectInstructions(BasicBlock::iterator Begin, BasicBlock::iterator En
 
   for (; I != End; ++I) {
     switch (I->getOpcode()) {
-    case Instruction::Add:
-      if (!SelectBinaryOp(I, ISD::ADD, ValueMap))  return I; break;
-    case Instruction::Sub:
-      if (!SelectBinaryOp(I, ISD::SUB, ValueMap))  return I; break;
-    case Instruction::Mul:
-      if (!SelectBinaryOp(I, ISD::MUL, ValueMap))  return I; break;
+    case Instruction::Add: {
+      ISD::NodeType Opc = I->getType()->isFPOrFPVector() ? ISD::FADD : ISD::ADD;
+      if (!SelectBinaryOp(I, Opc, ValueMap))  return I; break;
+    }
+    case Instruction::Sub: {
+      ISD::NodeType Opc = I->getType()->isFPOrFPVector() ? ISD::FSUB : ISD::SUB;
+      if (!SelectBinaryOp(I, Opc, ValueMap))  return I; break;
+    }
+    case Instruction::Mul: {
+      ISD::NodeType Opc = I->getType()->isFPOrFPVector() ? ISD::FMUL : ISD::MUL;
+      if (!SelectBinaryOp(I, Opc, ValueMap))  return I; break;
+    }
     case Instruction::SDiv:
       if (!SelectBinaryOp(I, ISD::SDIV, ValueMap)) return I; break;
     case Instruction::UDiv:
diff --git a/test/CodeGen/X86/fast-isel.ll b/test/CodeGen/X86/fast-isel.ll
index 1b0d5b2f8f6..b0be56b64b2 100644
--- a/test/CodeGen/X86/fast-isel.ll
+++ b/test/CodeGen/X86/fast-isel.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -fast-isel | grep add | count 1
+; RUN: llvm-as < %s | llc -fast-isel
 
 ; This tests very minimal fast-isel functionality.
 
@@ -21,3 +21,19 @@ exit:
   ret i32 %t5
 }
 
+define double @bar(double* %p, double* %q) {
+entry:
+  %r = load double* %p
+  %s = load double* %q
+  br label %fast
+
+fast:
+  %t0 = add double %r, %s
+  %t1 = mul double %t0, %s
+  %t2 = sub double %t1, %s
+  br label %exit
+
+exit:
+  ret double %t2
+}
+