diff -r 034e1e076c77 Lib/test/test_ftplib.py
--- a/Lib/test/test_ftplib.py	Sun Jan 20 12:18:34 2013 +0200
+++ b/Lib/test/test_ftplib.py	Sun Jan 27 23:40:22 2013 +0100
@@ -16,7 +16,7 @@
 except ImportError:
     ssl = None
 
-from unittest import TestCase
+from unittest import TestCase, mock
 from test import support
 from test.support import HOST
 threading = support.import_module('threading')
@@ -749,6 +749,21 @@
         self.assertEqual(ftplib.parse257('257 "/foo/b""ar"'), '/foo/b"ar')
         self.assertEqual(ftplib.parse257('257 "/foo/b""ar" created'), '/foo/b"ar')
 
+    def test_ftpcp(self):
+        storresp = '125 stor ok'
+        client_target = ftplib.FTP()
+        client_target.sendcmd = mock.MagicMock(return_value=storresp)
+        client_target.voidresp = mock.MagicMock()
+        client_target.voidcmd = mock.MagicMock()
+
+        client_source = ftplib.FTP()
+        client_source.sendcmd = mock.MagicMock(side_effect=('227 entering passive mode (127,0,0,1,187,211)', '125 retr ok'))
+        client_source.voidresp = mock.MagicMock()
+        client_source.voidcmd = mock.MagicMock()
+
+        ftplib.ftpcp(client_source, 'foo', client_target, targetname='foo_copied')
+
+        client_target.sendcmd.assert_called_with('STOR foo_copied')
 
 class TestIPv6Environment(TestCase):
 
diff -r 034e1e076c77 Misc/ACKS
--- a/Misc/ACKS	Sun Jan 20 12:18:34 2013 +0200
+++ b/Misc/ACKS	Sun Jan 27 23:40:22 2013 +0100
@@ -1343,3 +1343,4 @@
 Kai Zhu
 Tarek Ziadé
 Peter Åstrand
+Michał Jastrzębski