2 files changed, 4 insertions, 2 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index aa22f5f4..5a02a4fe 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,7 +7,8 @@ CHANGES
 -----
 
 * Issue 90: unknown setuptools version can be added in the working set
-*
+* Issue 87: setupt.py doesn't try to convert distribute_setup.py anymore
+  Initial Patch by arfrever.
 
 -----
 0.6.8
diff --git a/setup.py b/setup.py
index 9a845c1c..f0457b46 100755
--- a/setup.py
+++ b/setup.py
@@ -14,9 +14,10 @@ if sys.version_info >= (3,):
         fl.process_template_line(line)
     dir_util.create_tree(tmp_src, fl.files)
     outfiles_2to3 = []
+    dist_script = os.path.join("build", "src", "distribute_setup.py")
     for f in fl.files:
         outf, copied = file_util.copy_file(f, os.path.join(tmp_src, f), update=1)
-        if copied and outf.endswith(".py"):
+        if copied and outf.endswith(".py") and outf != dist_script:
             outfiles_2to3.append(outf)
         if copied and outf.endswith('api_tests.txt'):
             # XXX support this in distutils as well