diff --git a/Modules/Makefile.pre.in b/Modules/Makefile.pre.in
index 39c3b7c9df6..ff1ca9cacc6 100644
--- a/Modules/Makefile.pre.in
+++ b/Modules/Makefile.pre.in
@@ -88,6 +88,7 @@ clean:
 
 clobber:	clean
 		-rm -f *.a tags TAGS config.c glmodule.c Makefile.pre
+		-rm -f *.so so_locations
 
 config.c Makefile: Makefile.pre config.c.in $(MAKESETUP) Setup
 		$(SHELL) $(MAKESETUP) Setup
diff --git a/Modules/Setup.in b/Modules/Setup.in
index af7d2357d49..ffbf64ff5fb 100644
--- a/Modules/Setup.in
+++ b/Modules/Setup.in
@@ -60,13 +60,14 @@ TESTPATH=:$(DESTLIB)/test
 # Path for machine- or system-dependent modules (and shared libraries)
 MACHDEPPATH=:$(DESTLIB)/$(MACHDEP)
 
-PYTHONPATH=.:$(DESTLIB)$(TESTPATH)$(MACHDEPPATH)$(STDWINPATH)$(TKPATH)
+COREPYTHONPATH=.:$(DESTLIB)$(TESTPATH)$(MACHDEPPATH)$(STDWINPATH)$(TKPATH)
+PYTHONPATH=$(COREPYTHONPATH)
 
 
 # Modules that should always be present (non UNIX dependent)
 
 array arraymodule.c	# array objects
-math mathmodule.c	# math library functions, e.g. sin()
+math mathmodule.c -lm	# math library functions, e.g. sin()
 parser parsermodule.c	# raw interface to the Python parser
 posix posixmodule.c	# posix (UNIX) system calls
 regex regexmodule.c regexpr.c	# Regular expressions, GNU Emacs style