2 files changed, 2 insertions, 2 deletions
diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index e1aaa491..9955c8ef 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -360,7 +360,7 @@ def write_file (filename, contents):
     """
     contents = "\n".join(contents)
     if sys.version_info >= (3,):
-        contents = contents.encode("utf-8")
+        contents = contents.encode("utf-8", "surrogateescape")
     f = open(filename, "wb")        # always write POSIX-style manifest
     f.write(contents)
     f.close()
diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index d5259c2b..42558143 100755
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -283,7 +283,7 @@ class sdist(_sdist):
         manifest = open(self.manifest, 'rbU')
         for line in manifest:
             if sys.version_info >= (3,):
-                line = line.decode('UTF-8')
+                line = line.decode('UTF-8', 'surrogateescape')
             # ignore comments and blank lines
             line = line.strip()
             if line.startswith('#') or not line: