diff --git a/Mac/BuildScript/resources/ReadMe.txt b/Mac/BuildScript/resources/ReadMe.txt
index 761cffb..f1beda0 100644
--- a/Mac/BuildScript/resources/ReadMe.txt
+++ b/Mac/BuildScript/resources/ReadMe.txt
@@ -24,7 +24,7 @@
                     *******************
 
 The installer puts applications, an "Update Shell Profile" command,
-and an Extras folder containing demo programs and tools into the
+and a link to the optionally installed Python Documentation into the
 "Python $VERSION" subfolder of the system Applications folder,
 and puts the underlying machinery into the folder
 $PYTHONFRAMEWORKINSTALLDIR. It can
diff --git a/Mac/Extras.ReadMe.txt b/Mac/Extras.ReadMe.txt
deleted file mode 100644
index 2d7fd42..0000000
--- a/Mac/Extras.ReadMe.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-This folder contains examples of Python usage and useful scripts and tools.
-
-You should be aware that these are not Macintosh-specific but are shared
-among Python on all platforms, so there are some that only run on Windows
-or Unix or another platform, and/or make little sense on a Macintosh.
diff --git a/Mac/Makefile.in b/Mac/Makefile.in
index bc0c90d..5e57b57 100644
--- a/Mac/Makefile.in
+++ b/Mac/Makefile.in
@@ -177,11 +177,11 @@
 
 $(INSTALLED_PYTHONAPP): install_Python
 
-installextras: $(srcdir)/Extras.ReadMe.txt $(srcdir)/Extras.install.py
-	$(INSTALL) -d "$(DESTDIR)$(PYTHONAPPSDIR)/Extras"
-	$(INSTALL) $(srcdir)/Extras.ReadMe.txt "$(DESTDIR)$(PYTHONAPPSDIR)/Extras/ReadMe.txt"
+installextras: $(srcdir)/Extras.install.py
+	$(INSTALL) -d "$(DESTDIR)$(prefix)/share/doc/python$(VERSION)/examples"
 	$(RUNSHARED) $(BUILDPYTHON) $(srcdir)/Extras.install.py $(srcdir)/../Tools \
-		"$(DESTDIR)$(PYTHONAPPSDIR)/Extras/Tools"
+		"$(DESTDIR)$(prefix)/share/doc/python$(VERSION)/examples/Tools" ; \
+		chmod -R ugo+rX,go-w "$(DESTDIR)$(prefix)/share/doc/python$(VERSION)/examples/Tools"
 
 
 checkapplepython: $(srcdir)/Tools/fixapplepython23.py
diff --git a/Misc/NEWS b/Misc/NEWS
index 1a54024..4a7e3a9 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -29,6 +29,11 @@
 Build
 -----
 
+- Issue #11079: The /Applications/Python x.x folder created by the Mac
+  OS X installers now includes a link to the installed documentation
+  and no longer includes an Extras directory.  The Tools directory is
+  now installed in the framework under share/doc.
+
 - Issue #11121: Fix building with --enable-shared.
 
 Tests