diff -r 0026d94d45e6 Makefile.pre.in
--- a/Makefile.pre.in	Thu Jul 28 03:53:59 2016 +0000
+++ b/Makefile.pre.in	Thu Jul 28 10:47:31 2016 +0200
@@ -1310,33 +1310,54 @@
 		$(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \
 			$(DESTDIR)$(LIBDEST)/distutils/tests ; \
 	fi
-	-PYTHONPATH=$(DESTDIR)$(LIBDEST)  $(RUNSHARED) \
+	-if test "x@LEGACY_PYC_FILES@" = xyes; then \
+	    PYTHONPATH=$(DESTDIR)$(LIBDEST)  $(RUNSHARED) \
+		$(PYTHON_FOR_BUILD) -Wi -B $(DESTDIR)$(LIBDEST)/compileall.py \
+		-d $(LIBDEST) -f -b \
+		-x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
+		$(DESTDIR)$(LIBDEST); \
+	    PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+		$(PYTHON_FOR_BUILD) -Wi -B $(DESTDIR)$(LIBDEST)/compileall.py \
+		-d $(LIBDEST)/site-packages -f -b \
+		-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages; \
+	    for d in . $(LIBSUBDIRS); \
+	    do \
+		a=$(LIBDEST)/$$d; \
+		if test -d $(DESTDIR)$$a; then \
+		    echo "Removing source files in directory $$a"; \
+		    rm -f $(DESTDIR)$$a/*.py; \
+		else true; \
+		fi; \
+	    done; \
+	else \
+	    PYTHONPATH=$(DESTDIR)$(LIBDEST)  $(RUNSHARED) \
 		$(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \
 		-d $(LIBDEST) -f \
 		-x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
-		$(DESTDIR)$(LIBDEST)
-	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+		$(DESTDIR)$(LIBDEST); \
+	    PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
 		$(PYTHON_FOR_BUILD) -Wi -O $(DESTDIR)$(LIBDEST)/compileall.py \
 		-d $(LIBDEST) -f \
 		-x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
-		$(DESTDIR)$(LIBDEST)
-	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+		$(DESTDIR)$(LIBDEST); \
+	    PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
 		$(PYTHON_FOR_BUILD) -Wi -OO $(DESTDIR)$(LIBDEST)/compileall.py \
 		-d $(LIBDEST) -f \
 		-x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
-		$(DESTDIR)$(LIBDEST)
-	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+		$(DESTDIR)$(LIBDEST); \
+	    PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
 		$(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \
 		-d $(LIBDEST)/site-packages -f \
-		-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
-	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+		-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages; \
+	    PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
 		$(PYTHON_FOR_BUILD) -Wi -O $(DESTDIR)$(LIBDEST)/compileall.py \
 		-d $(LIBDEST)/site-packages -f \
-		-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
-	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+		-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages; \
+	    PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
 		$(PYTHON_FOR_BUILD) -Wi -OO $(DESTDIR)$(LIBDEST)/compileall.py \
 		-d $(LIBDEST)/site-packages -f \
-		-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
+		-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages; \
+	fi
 	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
 		$(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt
 	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
diff -r 0026d94d45e6 configure.ac
--- a/configure.ac	Thu Jul 28 03:53:59 2016 +0000
+++ b/configure.ac	Thu Jul 28 10:47:31 2016 +0200
@@ -203,6 +203,18 @@
 fi
 AC_SUBST(UNIVERSALSDK)
 
+AC_MSG_CHECKING(for --enable-legacy-pyc-files)
+AC_ARG_ENABLE([legacy-pyc-files],
+    AS_HELP_STRING([--enable-legacy-pyc-files], [install byte-code files to their
+    legacy locations and names to save space (default are the PEP 3147 locations and names)]))
+if test "x$enable_legacy_pyc_files" = xyes; then
+    LEGACY_PYC_FILES=yes
+else
+    enable_legacy_pyc_files=no
+fi
+AC_SUBST(LEGACY_PYC_FILES)
+AC_MSG_RESULT($enable_legacy_pyc_files)
+
 AC_SUBST(ARCH_RUN_32BIT)
 ARCH_RUN_32BIT=""