Index: b/setup.py
===================================================================
--- a/setup.py
+++ b/setup.py
@@ -127,20 +127,6 @@
             _add_directory(include_dirs, "/usr/X11/include")
 
         elif sys.platform.startswith("linux"):
-            for platform_ in (platform.processor(),platform.architecture()[0]):
-                if not platform_: continue
-
-                if platform_ in ["x86_64", "64bit"]:
-                    _add_directory(library_dirs, "/lib64")
-                    _add_directory(library_dirs, "/usr/lib64")
-                    _add_directory(library_dirs, "/usr/lib/x86_64-linux-gnu")
-                    break
-                elif platform_ in ["i386", "i686", "32bit"]:
-                    _add_directory(library_dirs, "/usr/lib/i386-linux-gnu")
-                    break
-            else:
-                raise ValueError("Unable to identify Linux platform: `%s`" % platform_)
-
             # XXX Kludge. Above /\ we brute force support multiarch. Here we
             # try Barry's more general approach. Afterward, something should
             # work ;-)
Index: b/Scripts/pilfont.py
===================================================================
--- a/Scripts/pilfont.py
+++ b/Scripts/pilfont.py
@@ -1,3 +1,5 @@
+#! /usr/bin/python
+
 #
 # The Python Imaging Library
 # $Id$
