Index: Lib/distutils/tests/test_filelist.py
===================================================================
--- Lib/distutils/tests/test_filelist.py	(revision 86537)
+++ Lib/distutils/tests/test_filelist.py	(working copy)
@@ -1,12 +1,32 @@
 """Tests for distutils.filelist."""
 import unittest
+import os
 
 from distutils.filelist import glob_to_re, FileList
 from test.support import captured_stdout, run_unittest
 from distutils import debug
+from distutils.tests import support
 
-class FileListTestCase(unittest.TestCase):
+class FileListTestCase(support.TempdirManager, unittest.TestCase):
 
+    def test_whitespace(self):
+        tmpdir = self.mkdtemp()
+        parentdir, dirname = os.path.split(tmpdir)
+
+        # create a file with a space in it's name
+        tmpfile = "file name with spaces.txt"
+        self.write_file([tmpdir, tmpfile])
+
+        os.chdir(parentdir)
+        file_list = FileList()
+
+        # make sure the include worked
+        self.assertTrue(file_list.include_pattern("%s/*" % (dirname)))
+        # the correct number of files were found by the include
+        self.assertTrue(1, len(file_list.files))
+        # the file name has preserved the spaces
+        self.assertEquals(os.path.join(dirname, tmpfile), file_list.files[0])
+
     def test_glob_to_re(self):
         # simple cases
         self.assertEquals(glob_to_re('foo*'), 'foo[^/]*\\Z(?ms)')