diff -r 2a1de922651a Lib/pickle.py
--- a/Lib/pickle.py	Mon Nov 25 13:25:12 2013 -0800
+++ b/Lib/pickle.py	Mon Nov 25 23:53:45 2013 +0200
@@ -192,16 +192,18 @@
         self.current_frame = io.BytesIO()
 
     def end_framing(self):
-        if self.current_frame and self.current_frame.tell() > 0:
-            self.commit_frame(force=True)
+        if self.current_frame:
+            self.commit_frame(final=True)
             self.current_frame = None
 
-    def commit_frame(self, force=False):
+    def commit_frame(self, final=False):
         if self.current_frame:
             f = self.current_frame
-            if f.tell() >= self._FRAME_SIZE_TARGET or force:
+            if f.tell() >= self._FRAME_SIZE_TARGET or final:
                 with f.getbuffer() as data:
                     n = len(data)
+                    if not final:
+                        n += 9  # next frame header
                     write = self.file_write
                     write(FRAME)
                     write(pack("<Q", n))
diff -r 2a1de922651a Lib/test/pickletester.py
--- a/Lib/test/pickletester.py	Mon Nov 25 13:25:12 2013 -0800
+++ b/Lib/test/pickletester.py	Mon Nov 25 23:53:45 2013 +0200
@@ -3,6 +3,7 @@
 import pickle
 import pickletools
 import random
+import struct
 import sys
 import unittest
 import weakref
@@ -1369,21 +1370,33 @@
 
         def remove_frames(pickled, keep_frame=None):
             """Remove frame opcodes from the given pickle."""
-            frame_starts = []
-            # 1 byte for the opcode and 8 for the argument
-            frame_opcode_size = 9
+            frame_ranges = []
             for opcode, _, pos in pickletools.genops(pickled):
                 if opcode.name == 'FRAME':
-                    frame_starts.append(pos)
+                    frame_size, = struct.unpack('<Q', pickled[pos+1: pos+9])
+                    frame_ranges.append((pos, pos + 9 + frame_size))
 
             newpickle = bytearray()
-            last_frame_end = 0
-            for i, pos in enumerate(frame_starts):
+            patch_slice = None
+            last_end = 0
+            for i, (start, end) in enumerate(frame_ranges):
+                if start < last_end:
+                    self.assertEqual(last_end - start, 9)
+                    if patch_slice is not None:
+                        frame_size, = struct.unpack('<Q', newpickle[patch_slice])
+                        newpickle[patch_slice] = struct.pack('<Q', frame_size - 9)
+                    self.assertEqual(newpickle[-9:], pickled[start: start + 9])
+                    del newpickle[-9:]
+                else:
+                    newpickle += pickled[last_end: start]
                 if keep_frame and keep_frame(i):
-                    continue
-                newpickle += pickled[last_frame_end:pos]
-                last_frame_end = pos + frame_opcode_size
-            newpickle += pickled[last_frame_end:]
+                    patch_slice = slice(len(newpickle) + 1, len(newpickle) + 9)
+                    newpickle += pickled[start: end]
+                else:
+                    patch_slice = None
+                    newpickle += pickled[start + 9: end]
+                last_end = end
+            newpickle += pickled[last_end:]
             return newpickle
 
         frame_size = self.FRAME_SIZE_TARGET
diff -r 2a1de922651a Modules/_pickle.c
--- a/Modules/_pickle.c	Mon Nov 25 13:25:12 2013 -0800
+++ b/Modules/_pickle.c	Mon Nov 25 23:53:45 2013 +0200
@@ -730,7 +730,7 @@
 }
 
 static int
-_Pickler_CommitFrame(PicklerObject *self)
+_Pickler_CommitFrame(PicklerObject *self, int final)
 {
     size_t frame_len;
     char *qdata;
@@ -738,6 +738,8 @@
     if (!self->framing || self->frame_start == -1)
         return 0;
     frame_len = self->output_len - self->frame_start - FRAME_HEADER_SIZE;
+    if (!final)
+        frame_len += FRAME_HEADER_SIZE; /* next frame header */
     qdata = PyBytes_AS_STRING(self->output_buffer) + self->frame_start;
     _Pickler_WriteFrameHeader(self, qdata, frame_len);
     self->frame_start = -1;
@@ -753,7 +755,7 @@
         return 0;
     frame_len = self->output_len - self->frame_start - FRAME_HEADER_SIZE;
     if (frame_len >= FRAME_SIZE_TARGET)
-        return _Pickler_CommitFrame(self);
+        return _Pickler_CommitFrame(self, 0);
     else
         return 0;
 }
@@ -765,7 +767,7 @@
 
     assert(self->output_buffer != NULL);
 
-    if (_Pickler_CommitFrame(self))
+    if (_Pickler_CommitFrame(self, 1))
         return NULL;
 
     self->output_buffer = NULL;