diff --git a/Modules/getpath.c b/Modules/getpath.c
index c057737..f26b8e9 100644
--- a/Modules/getpath.c
+++ b/Modules/getpath.c
@@ -734,6 +734,11 @@
 
     bufsz += wcslen(zip_path) + 1;
     bufsz += wcslen(exec_prefix) + 1;
+    /* When running from the build directory, add room for the Modules
+     * subdirectory too.
+     */
+    if (efound == -1)
+        bufsz += wcslen(argv0_path) + wcslen(L"Modules") + 2;
 
     buf = (wchar_t *)PyMem_Malloc(bufsz * sizeof(wchar_t));
     if (buf == NULL) {
@@ -781,6 +786,15 @@
 
     /* Finally, on goes the directory for dynamic-load modules */
     wcscat(buf, exec_prefix);
+   /* And, if we run from a build directory, the Modules directory (for
+    * modules built with Modules/Setup.)
+    */
+   if (efound == -1) {
+       wcscat(buf, delimiter);
+       wcscat(buf, argv0_path);
+       wcscat(buf, separator);
+       wcscat(buf, L"Modules");
+   }
 
     /* And publish the results */
     module_search_path = buf;
diff --git a/Modules/makesetup b/Modules/makesetup
index 40dfa9d..8b5cc28 100755
--- a/Modules/makesetup
+++ b/Modules/makesetup
@@ -217,7 +217,7 @@
 			*) src='$(srcdir)/'"$srcdir/$src";;
 			esac
 			case $doconfig in
-			no)	cc="$cc \$(CCSHARED) \$(CFLAGS) \$(CPPFLAGS)";;
+			no)	cc="$cc \$(CCSHARED) \$(PY_CFLAGS) \$(PY_CPPFLAGS)";;
 			*)
 				cc="$cc \$(PY_CORE_CFLAGS)";;
 			esac
@@ -229,11 +229,7 @@
 		esac
 		for mod in $mods
 		do
-			case $objs in
-			*$mod.o*)	base=$mod;;
-			*)		base=${mod}module;;
-			esac
-			file="$srcdir/$base\$(SO)"
+			file="$srcdir/$mod\$(EXT_SUFFIX)"
 			case $doconfig in
 			no)	SHAREDMODS="$SHAREDMODS $file";;
 			esac