diff --git a/editors/leo/Makefile b/editors/leo/Makefile
index 4970eac2e53b..750377e2acbe 100644
--- a/editors/leo/Makefile
+++ b/editors/leo/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	leo
-PORTVERSION=	4.1
+PORTVERSION=	4.2.1
 CATEGORIES=	editors python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/editors/leo/distinfo b/editors/leo/distinfo
index 22a31c9433d5..e3da7aca2a45 100644
--- a/editors/leo/distinfo
+++ b/editors/leo/distinfo
@@ -1,2 +1,2 @@
-MD5 (leo/leo-4.1-final.zip) = f7ed48903753ecf678e78f6ece3120f6
-SIZE (leo/leo-4.1-final.zip) = 2088151
+MD5 (leo/leo-4.2.1-final.zip) = 07f10ff111a4ea4b1ed583726bc6e764
+SIZE (leo/leo-4.2.1-final.zip) = 1885496
diff --git a/editors/leo/pkg-plist b/editors/leo/pkg-plist
index 784d5e7458c7..a576499706ed 100644
--- a/editors/leo/pkg-plist
+++ b/editors/leo/pkg-plist
@@ -2,7 +2,6 @@
 bin/leo
 %%PYTHON_SITELIBDIR%%/leo/Icons/LeoWin.gif
 %%PYTHON_SITELIBDIR%%/leo/Icons/Leoapp.GIF
-%%PYTHON_SITELIBDIR%%/leo/Icons/Leodoc.gif
 %%PYTHON_SITELIBDIR%%/leo/Icons/box00.GIF
 %%PYTHON_SITELIBDIR%%/leo/Icons/box01.GIF
 %%PYTHON_SITELIBDIR%%/leo/Icons/box02.GIF
@@ -25,66 +24,82 @@ bin/leo
 %%PYTHON_SITELIBDIR%%/leo/Icons/plusnode.gif
 %%PYTHON_SITELIBDIR%%/leo/Icons/rt_arrow_disabled.gif
 %%PYTHON_SITELIBDIR%%/leo/Icons/rt_arrow_enabled.gif
-%%PYTHON_SITELIBDIR%%/leo/Icons/section_icon.gif
 %%PYTHON_SITELIBDIR%%/leo/config/leoConfig.leo
 %%PYTHON_SITELIBDIR%%/leo/config/leoConfig.txt
-%%PYTHON_SITELIBDIR%%/leo/plugins/___script_leo.py
+%%PYTHON_SITELIBDIR%%/leo/plugins/ConceptualSort.py
+%%PYTHON_SITELIBDIR%%/leo/plugins/Configurator.py
+%%PYTHON_SITELIBDIR%%/leo/plugins/FileActions.py
+%%PYTHON_SITELIBDIR%%/leo/plugins/TabbedLog.py
+%%PYTHON_SITELIBDIR%%/leo/plugins/UASearch.py
+%%PYTHON_SITELIBDIR%%/leo/plugins/URLloader.py
+%%PYTHON_SITELIBDIR%%/leo/plugins/UniversalScrolling.py
+%%PYTHON_SITELIBDIR%%/leo/plugins/__outlineExperiments.py
 %%PYTHON_SITELIBDIR%%/leo/plugins/__overrideClasses.py
 %%PYTHON_SITELIBDIR%%/leo/plugins/__wx_gui.py
 %%PYTHON_SITELIBDIR%%/leo/plugins/add_directives.py
 %%PYTHON_SITELIBDIR%%/leo/plugins/arrows.py
+%%PYTHON_SITELIBDIR%%/leo/plugins/aspell.pyd
 %%PYTHON_SITELIBDIR%%/leo/plugins/at_folder.py
+%%PYTHON_SITELIBDIR%%/leo/plugins/at_produce.py
+%%PYTHON_SITELIBDIR%%/leo/plugins/autocompleter.py
+%%PYTHON_SITELIBDIR%%/leo/plugins/chapters.py
+%%PYTHON_SITELIBDIR%%/leo/plugins/chinese_menu.py
 %%PYTHON_SITELIBDIR%%/leo/plugins/color_markup.py
-%%PYTHON_SITELIBDIR%%/leo/plugins/default.css
 %%PYTHON_SITELIBDIR%%/leo/plugins/dump_globals.py
+%%PYTHON_SITELIBDIR%%/leo/plugins/dyna_menu.py
+%%PYTHON_SITELIBDIR%%/leo/plugins/dynacommon.py
+%%PYTHON_SITELIBDIR%%/leo/plugins/editAttributes.py
 %%PYTHON_SITELIBDIR%%/leo/plugins/empty_leo_file.py
 %%PYTHON_SITELIBDIR%%/leo/plugins/enable_gc.py
-%%PYTHON_SITELIBDIR%%/leo/plugins/french.py
+%%PYTHON_SITELIBDIR%%/leo/plugins/exSButton.py
 %%PYTHON_SITELIBDIR%%/leo/plugins/french_fm.py
 %%PYTHON_SITELIBDIR%%/leo/plugins/hoist.py
 %%PYTHON_SITELIBDIR%%/leo/plugins/image.py
 %%PYTHON_SITELIBDIR%%/leo/plugins/import_cisco_config.py
 %%PYTHON_SITELIBDIR%%/leo/plugins/leoPlugins.leo
-%%PYTHON_SITELIBDIR%%/leo/plugins/leo_rst.css
-%%PYTHON_SITELIBDIR%%/leo/plugins/leopm_client.py
-%%PYTHON_SITELIBDIR%%/leo/plugins/leopm_server.py
+%%PYTHON_SITELIBDIR%%/leo/plugins/lineNumbers.py
+%%PYTHON_SITELIBDIR%%/leo/plugins/macros.py
+%%PYTHON_SITELIBDIR%%/leo/plugins/maximizeNewWindows.py
 %%PYTHON_SITELIBDIR%%/leo/plugins/mod_autosave.ini
 %%PYTHON_SITELIBDIR%%/leo/plugins/mod_autosave.py
 %%PYTHON_SITELIBDIR%%/leo/plugins/mod_http.ini
 %%PYTHON_SITELIBDIR%%/leo/plugins/mod_http.py
+%%PYTHON_SITELIBDIR%%/leo/plugins/mod_scripting.py
 %%PYTHON_SITELIBDIR%%/leo/plugins/mod_spelling.ini
 %%PYTHON_SITELIBDIR%%/leo/plugins/mod_spelling.py
 %%PYTHON_SITELIBDIR%%/leo/plugins/mod_spelling.txt
-%%PYTHON_SITELIBDIR%%/leo/plugins/mod_spelling.wl
 %%PYTHON_SITELIBDIR%%/leo/plugins/mod_tempfname.py
-%%PYTHON_SITELIBDIR%%/leo/plugins/mod_test.ini
 %%PYTHON_SITELIBDIR%%/leo/plugins/mod_timestamp.py
-%%PYTHON_SITELIBDIR%%/leo/plugins/mod_updown.py
 %%PYTHON_SITELIBDIR%%/leo/plugins/nav_buttons.py
 %%PYTHON_SITELIBDIR%%/leo/plugins/newButtons.py
+%%PYTHON_SITELIBDIR%%/leo/plugins/niceNosent.py
 %%PYTHON_SITELIBDIR%%/leo/plugins/nodenavigator.py
 %%PYTHON_SITELIBDIR%%/leo/plugins/open_shell.py
 %%PYTHON_SITELIBDIR%%/leo/plugins/open_with.py
 %%PYTHON_SITELIBDIR%%/leo/plugins/outline_export.py
 %%PYTHON_SITELIBDIR%%/leo/plugins/override_commands.py
+%%PYTHON_SITELIBDIR%%/leo/plugins/pie_menus.py
 %%PYTHON_SITELIBDIR%%/leo/plugins/pluginsManager.txt
-%%PYTHON_SITELIBDIR%%/leo/plugins/pluginsTest.ini
+%%PYTHON_SITELIBDIR%%/leo/plugins/pluginsNotes.txt
 %%PYTHON_SITELIBDIR%%/leo/plugins/pluginsTest.py
 %%PYTHON_SITELIBDIR%%/leo/plugins/plugins_menu.py
 %%PYTHON_SITELIBDIR%%/leo/plugins/quit_leo.py
+%%PYTHON_SITELIBDIR%%/leo/plugins/rClick.py
 %%PYTHON_SITELIBDIR%%/leo/plugins/read_only_nodes.py
 %%PYTHON_SITELIBDIR%%/leo/plugins/redefine_put.py
 %%PYTHON_SITELIBDIR%%/leo/plugins/redirect_to_log.py
 %%PYTHON_SITELIBDIR%%/leo/plugins/rowcol.py
 %%PYTHON_SITELIBDIR%%/leo/plugins/rst.py
 %%PYTHON_SITELIBDIR%%/leo/plugins/rst2.py
+%%PYTHON_SITELIBDIR%%/leo/plugins/run_nodes.py
+%%PYTHON_SITELIBDIR%%/leo/plugins/scheduler.py
 %%PYTHON_SITELIBDIR%%/leo/plugins/script_io_to_body.py
 %%PYTHON_SITELIBDIR%%/leo/plugins/scripts_menu.py
 %%PYTHON_SITELIBDIR%%/leo/plugins/searchbox.py
-%%PYTHON_SITELIBDIR%%/leo/plugins/settings_menu.py
-%%PYTHON_SITELIBDIR%%/leo/plugins/silver_city.css
+%%PYTHON_SITELIBDIR%%/leo/plugins/spellpyx.py
 %%PYTHON_SITELIBDIR%%/leo/plugins/startfile.py
 %%PYTHON_SITELIBDIR%%/leo/plugins/status_line.py
+%%PYTHON_SITELIBDIR%%/leo/plugins/style_guide.py
 %%PYTHON_SITELIBDIR%%/leo/plugins/trace_gc.py
 %%PYTHON_SITELIBDIR%%/leo/plugins/trace_keys.py
 %%PYTHON_SITELIBDIR%%/leo/plugins/trace_tags.py
@@ -93,6 +108,7 @@ bin/leo
 %%PYTHON_SITELIBDIR%%/leo/plugins/word_export.py
 %%PYTHON_SITELIBDIR%%/leo/plugins/xemacs.py
 %%PYTHON_SITELIBDIR%%/leo/src/LeoPy.leo
+%%PYTHON_SITELIBDIR%%/leo/src/__init__.py
 %%PYTHON_SITELIBDIR%%/leo/src/leo.py
 %%PYTHON_SITELIBDIR%%/leo/src/leoApp.py
 %%PYTHON_SITELIBDIR%%/leo/src/leoAtFile.py
@@ -101,10 +117,8 @@ bin/leo
 %%PYTHON_SITELIBDIR%%/leo/src/leoCommands.py
 %%PYTHON_SITELIBDIR%%/leo/src/leoCompare.py
 %%PYTHON_SITELIBDIR%%/leo/src/leoConfig.py
-%%PYTHON_SITELIBDIR%%/leo/src/leoDialog.py
 %%PYTHON_SITELIBDIR%%/leo/src/leoFileCommands.py
 %%PYTHON_SITELIBDIR%%/leo/src/leoFind.py
-%%PYTHON_SITELIBDIR%%/leo/src/leoFindScript.py
 %%PYTHON_SITELIBDIR%%/leo/src/leoFontPanel.py
 %%PYTHON_SITELIBDIR%%/leo/src/leoFrame.py
 %%PYTHON_SITELIBDIR%%/leo/src/leoGlobals.py
@@ -115,6 +129,7 @@ bin/leo
 %%PYTHON_SITELIBDIR%%/leo/src/leoNodes.py
 %%PYTHON_SITELIBDIR%%/leo/src/leoPlugins.py
 %%PYTHON_SITELIBDIR%%/leo/src/leoPrefs.py
+%%PYTHON_SITELIBDIR%%/leo/src/leoProjects.txt
 %%PYTHON_SITELIBDIR%%/leo/src/leoTangle.py
 %%PYTHON_SITELIBDIR%%/leo/src/leoTest.py
 %%PYTHON_SITELIBDIR%%/leo/src/leoTkinterColorPanels.py
@@ -128,8 +143,8 @@ bin/leo
 %%PYTHON_SITELIBDIR%%/leo/src/leoTkinterMenu.py
 %%PYTHON_SITELIBDIR%%/leo/src/leoTkinterPrefs.py
 %%PYTHON_SITELIBDIR%%/leo/src/leoTkinterTree.py
-%%PYTHON_SITELIBDIR%%/leo/src/leoTree.py
 %%PYTHON_SITELIBDIR%%/leo/src/leoUndo.py
+%%PYTHON_SITELIBDIR%%/leo/src/oldLeoProjects.leo
 %%PORTDOCS%%%%PYTHON_SITELIBDIR%%/leo/doc/LeoDocs.leo
 %%PORTDOCS%%@dirrm %%PYTHON_SITELIBDIR%%/leo/doc
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE.TXT