diff --git a/lib/Target/X86/X86ISelLowering.cpp b/lib/Target/X86/X86ISelLowering.cpp
index 82be2158346..73148e6fa03 100644
--- a/lib/Target/X86/X86ISelLowering.cpp
+++ b/lib/Target/X86/X86ISelLowering.cpp
@@ -251,9 +251,11 @@ X86TargetLowering::X86TargetLowering(TargetMachine &TM)
   }
   computeRegisterProperties();
 
-  maxStoresPerMemSet = 8; // For %llvm.memset -> sequence of stores
-  maxStoresPerMemCpy = 8; // For %llvm.memcpy -> sequence of stores
-  maxStoresPerMemMove = 8; // For %llvm.memmove -> sequence of stores
+  // FIXME: These should be based on subtarget info. Plus, the values should
+  // be smaller when we are in optimizing for size mode.
+  maxStoresPerMemSet = 16; // For %llvm.memset -> sequence of stores
+  maxStoresPerMemCpy = 16; // For %llvm.memcpy -> sequence of stores
+  maxStoresPerMemMove = 16; // For %llvm.memmove -> sequence of stores
   allowUnalignedMemoryAccesses = true; // x86 supports it!
 }