diff --git a/.gitignore b/.gitignore
index 1653dc42..2fd6fc7b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+/build
+/dist
 /pycdio.pyc
 /pycdio_wrap.c
 /pyiso9660_wrap.c
diff --git a/setup.py b/setup.py
index 537d6f46..8a9c604b 100755
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 """
-setup.py file for pycdio
+distutils setup (setup.py) for pycdio
 """
 
 from setuptools import setup
@@ -13,17 +13,13 @@ import os
 README = os.path.join(os.path.dirname(__file__), 'README.txt')
 long_description = open(README).read() + '\n\n'
 
-pycdio_module = Extension('_pycdio',
-                          sources=['pycdio_wrap.c', 'swig/pycdio.swg'],
-                          )
-pyiso9660_module = Extension('_pyiso9660',
-                             sources=['iso9660_wrap.c', 'swig/pyiso9660.swg'],
-                          )
+pycdio_module    = Extension('_pycdio', sources=['swig/pycdio.i'])
+pyiso9660_module = Extension('_pyiso9660', sources=['swig/pyiso9660.i'])
 setup (name = 'pycdio',
        author             = 'Rocky Bernstein',
        author_email       = 'rocky@gnu.org',
        description        = 'Python OO interface to libcdio (CD Input and Control library)',
-       py_ext_modules     = [pycdio_module, pyiso9660_module],
+       ext_modules        = [pycdio_module, pyiso9660_module],
        license            = 'GPL',
        long_description   = long_description,
        name               = 'pytracer', 
diff --git a/swig/pycdio.swg b/swig/pycdio.i
similarity index 100%
rename from swig/pycdio.swg
rename to swig/pycdio.i
diff --git a/swig/pyiso9660.swg b/swig/pyiso9660.i
similarity index 100%
rename from swig/pyiso9660.swg
rename to swig/pyiso9660.i
diff --git a/test/test-cdio.py b/test/test-cdio.py
old mode 100755
new mode 100644
index 4e57cd8b..4efd251d
--- a/test/test-cdio.py
+++ b/test/test-cdio.py
@@ -5,7 +5,8 @@ Note: for compatibility with old unittest 1.46 we won't use assertTrue
 or assertFalse."""
 import unittest, sys, os
 
-libdir = os.path.join(os.path.dirname(__file__), '..')
+libdir = os.path.join(os.path.dirname(__file__), 
+                      '..', 'build', 'lib.linux-i686-2.5')
 if libdir[-1] != os.path.sep:
     libdir += os.path.sep
 sys.path.insert(0, libdir)
diff --git a/test/test-iso.py b/test/test-iso.py
old mode 100755
new mode 100644
diff --git a/test/test-isocopy.py b/test/test-isocopy.py
old mode 100755
new mode 100644