diff --git a/mail/exmh2/pkg-plist b/mail/exmh2/pkg-plist
index 28a7c299979f..3f9e961435ba 100644
--- a/mail/exmh2/pkg-plist
+++ b/mail/exmh2/pkg-plist
@@ -2,170 +2,168 @@ bin/exmh
 bin/exmh-async
 bin/exmh-bg
 bin/ftp.expect
-lib/exmh-2.0delta/SeditSelFmt.tcl
-lib/exmh-2.0delta/SeditSelSpell.tcl
-lib/exmh-2.0delta/addr.tcl
-lib/exmh-2.0delta/aliases.tcl
-lib/exmh-2.0delta/app-defaults
-lib/exmh-2.0delta/app-defaults-color
-lib/exmh-2.0delta/app-defaults-mono
-lib/exmh-2.0delta/app-defaults.orig
-lib/exmh-2.0delta/audit.tcl
-lib/exmh-2.0delta/autorefile.tcl
-lib/exmh-2.0delta/background.tcl
-lib/exmh-2.0delta/bindings.tcl
-lib/exmh-2.0delta/busy.tcl
-lib/exmh-2.0delta/buttons.tcl
-lib/exmh-2.0delta/clink.au
-lib/exmh-2.0delta/crypt.tcl
-lib/exmh-2.0delta/cutbuffer.tcl
-lib/exmh-2.0delta/dragNdrop.tcl
-lib/exmh-2.0delta/drip.au
-lib/exmh-2.0delta/editor.tcl
-lib/exmh-2.0delta/env.tcl
-lib/exmh-2.0delta/error.tcl
-lib/exmh-2.0delta/exmh.bitmap
-lib/exmh-2.0delta/extrasInit.tcl
-lib/exmh-2.0delta/exwin.tcl
-lib/exmh-2.0delta/faces.tcl
-lib/exmh-2.0delta/fcache.tcl
-lib/exmh-2.0delta/fdisp.tcl
-lib/exmh-2.0delta/fdispColor.tcl
-lib/exmh-2.0delta/fdispPopup.tcl
-lib/exmh-2.0delta/fileselect.tcl
-lib/exmh-2.0delta/find.tcl
-lib/exmh-2.0delta/flag.tcl
-lib/exmh-2.0delta/flagdown.bitmap
-lib/exmh-2.0delta/flagup.bitmap
-lib/exmh-2.0delta/flist.tcl
-lib/exmh-2.0delta/folder.tcl
-lib/exmh-2.0delta/folderNew.tcl
-lib/exmh-2.0delta/fontsel.tcl
-lib/exmh-2.0delta/ftoc.tcl
-lib/exmh-2.0delta/ftocColor.tcl
-lib/exmh-2.0delta/ftocFind.tcl
-lib/exmh-2.0delta/getnews.tcl
-lib/exmh-2.0delta/glimpse.tcl
-lib/exmh-2.0delta/help.tcl
-lib/exmh-2.0delta/hourglass.bitmap
-lib/exmh-2.0delta/hourglass.mask
-lib/exmh-2.0delta/hourglass1.bitmap
-lib/exmh-2.0delta/hourglass2.bitmap
-lib/exmh-2.0delta/hourglass2.mask
-lib/exmh-2.0delta/html.tcl
-lib/exmh-2.0delta/html/AddrEdit.html
-lib/exmh-2.0delta/html/AddressBk.html
-lib/exmh-2.0delta/html/AliasAddr.html
-lib/exmh-2.0delta/html/Aliases.html
-lib/exmh-2.0delta/html/Bindings.html
-lib/exmh-2.0delta/html/Font.html
-lib/exmh-2.0delta/html/Import.html
-lib/exmh-2.0delta/html/Intro.html
-lib/exmh-2.0delta/html/Keys.html
-lib/exmh-2.0delta/html/Lists.html
-lib/exmh-2.0delta/html/PGP.html
-lib/exmh-2.0delta/html/Preferences.html
-lib/exmh-2.0delta/html/Reply.html
-lib/exmh-2.0delta/html/Search.html
-lib/exmh-2.0delta/html/Sedit.html
-lib/exmh-2.0delta/html/Seditpref.html
-lib/exmh-2.0delta/html/blu-ball.gif
-lib/exmh-2.0delta/html/copyright.html
-lib/exmh-2.0delta/html/exmh-custom.n.html
-lib/exmh-2.0delta/html/exmh-fans.html
-lib/exmh-2.0delta/html/exmh-faq.html
-lib/exmh-2.0delta/html/exmh-ref.n.html
-lib/exmh-2.0delta/html/exmh-use.n.html
-lib/exmh-2.0delta/html/exmh.README.html
-lib/exmh-2.0delta/html/exmh.n.html
-lib/exmh-2.0delta/html/exmh.pref.gif
-lib/exmh-2.0delta/html/exmh.snap1.gif
-lib/exmh-2.0delta/html/index.html
-lib/exmh-2.0delta/html/left-arrow.gif
-lib/exmh-2.0delta/html/maillist.html
-lib/exmh-2.0delta/html/overview.html
-lib/exmh-2.0delta/html/red-ball.gif
-lib/exmh-2.0delta/html/right-arrow.gif
-lib/exmh-2.0delta/html/software.html
-lib/exmh-2.0delta/html/whatis.html
-lib/exmh-2.0delta/html/yel-ball.gif
-lib/exmh-2.0delta/html_cache.tcl
-lib/exmh-2.0delta/html_content.tcl
-lib/exmh-2.0delta/html_dpackage.tcl
-lib/exmh-2.0delta/html_formtag.tcl
-lib/exmh-2.0delta/html_frame.tcl
-lib/exmh-2.0delta/html_get_http.tcl
-lib/exmh-2.0delta/html_head.tcl
-lib/exmh-2.0delta/html_hr.tcl
-lib/exmh-2.0delta/html_images.tcl
-lib/exmh-2.0delta/html_links.tcl
-lib/exmh-2.0delta/html_maps.tcl
-lib/exmh-2.0delta/html_stubs.tcl
-lib/exmh-2.0delta/html_tags.tcl
-lib/exmh-2.0delta/html_text.tcl
-lib/exmh-2.0delta/http_proxy.tcl
-lib/exmh-2.0delta/import.tcl
-lib/exmh-2.0delta/inc.tcl
-lib/exmh-2.0delta/ispell.tcl
-lib/exmh-2.0delta/labels.tcl
-lib/exmh-2.0delta/linethru.bitmap
-lib/exmh-2.0delta/mailcap.tcl
-lib/exmh-2.0delta/main.tcl
-lib/exmh-2.0delta/mbempty.bitmap
-lib/exmh-2.0delta/mbtidy.bitmap
-lib/exmh-2.0delta/mbuntidy.bitmap
-lib/exmh-2.0delta/mh.tcl
-lib/exmh-2.0delta/mime.tcl
-lib/exmh-2.0delta/mime.types
-lib/exmh-2.0delta/mimeSun.tcl
-lib/exmh-2.0delta/mosaic.tcl
-lib/exmh-2.0delta/msg.tcl
-lib/exmh-2.0delta/msgShow.tcl
-lib/exmh-2.0delta/partial.tcl
-lib/exmh-2.0delta/pgp.tcl
-lib/exmh-2.0delta/pgpEWN.tcl
-lib/exmh-2.0delta/pgpExec.tcl
-lib/exmh-2.0delta/pgpMatch.tcl
-lib/exmh-2.0delta/pgpMisc.tcl
-lib/exmh-2.0delta/pgpwww.tcl
-lib/exmh-2.0delta/pick.tcl
-lib/exmh-2.0delta/post.tcl
-lib/exmh-2.0delta/preferences.tcl
-lib/exmh-2.0delta/print.tcl
-lib/exmh-2.0delta/ps.tcl
-lib/exmh-2.0delta/quote.tcl
-lib/exmh-2.0delta/receipt.tcl
-lib/exmh-2.0delta/report.tcl
-lib/exmh-2.0delta/rich2tk.tcl
-lib/exmh-2.0delta/scan.tcl
-lib/exmh-2.0delta/sedit.tcl
-lib/exmh-2.0delta/seditBind.tcl
-lib/exmh-2.0delta/seditCompose.tcl
-lib/exmh-2.0delta/seditEnriched.tcl
-lib/exmh-2.0delta/seditExtras.tcl
-lib/exmh-2.0delta/seditMime.tcl
-lib/exmh-2.0delta/seditQP.tcl
-lib/exmh-2.0delta/seditSel.tcl
-lib/exmh-2.0delta/select.tcl
-lib/exmh-2.0delta/send.tcl
-lib/exmh-2.0delta/sound.tcl
-lib/exmh-2.0delta/tclIndex
-lib/exmh-2.0delta/text.tcl
-lib/exmh-2.0delta/textButton.tcl
-lib/exmh-2.0delta/textSelect.tcl
-lib/exmh-2.0delta/thread.tcl
-lib/exmh-2.0delta/timer.bitmap
-lib/exmh-2.0delta/tioga.tcl
-lib/exmh-2.0delta/unseenwin.tcl
-lib/exmh-2.0delta/uri.tcl
-lib/exmh-2.0delta/url.bitmap
-lib/exmh-2.0delta/user.tcl
-lib/exmh-2.0delta/utils.tcl
-lib/exmh-2.0delta/widgetMenu.tcl
-lib/exmh-2.0delta/widgetText.tcl
-lib/exmh-2.0delta/widgets.tcl
-lib/exmh-2.0delta/xns.tcl
-lib/exmh-2.0delta/xnsgetmail.exp
+lib/exmh-2.0zeta/addr.tcl
+lib/exmh-2.0zeta/aliases.tcl
+lib/exmh-2.0zeta/app-defaults
+lib/exmh-2.0zeta/app-defaults-color
+lib/exmh-2.0zeta/app-defaults-mono
+lib/exmh-2.0zeta/audit.tcl
+lib/exmh-2.0zeta/autorefile.tcl
+lib/exmh-2.0zeta/background.tcl
+lib/exmh-2.0zeta/base64.tcl
+lib/exmh-2.0zeta/bindings.tcl
+lib/exmh-2.0zeta/busy.tcl
+lib/exmh-2.0zeta/buttons.tcl
+lib/exmh-2.0zeta/clink.au
+lib/exmh-2.0zeta/crypt.tcl
+lib/exmh-2.0zeta/cutbuffer.tcl
+lib/exmh-2.0zeta/dragNdrop.tcl
+lib/exmh-2.0zeta/drip.au
+lib/exmh-2.0zeta/editor.tcl
+lib/exmh-2.0zeta/env.tcl
+lib/exmh-2.0zeta/error.tcl
+lib/exmh-2.0zeta/exmh.bitmap
+lib/exmh-2.0zeta/extrasInit.tcl
+lib/exmh-2.0zeta/exwin.tcl
+lib/exmh-2.0zeta/faces.tcl
+lib/exmh-2.0zeta/fcache.tcl
+lib/exmh-2.0zeta/fdisp.tcl
+lib/exmh-2.0zeta/fdispColor.tcl
+lib/exmh-2.0zeta/fdispPopup.tcl
+lib/exmh-2.0zeta/fileselect.tcl
+lib/exmh-2.0zeta/find.tcl
+lib/exmh-2.0zeta/flag.tcl
+lib/exmh-2.0zeta/flagdown.bitmap
+lib/exmh-2.0zeta/flagup.bitmap
+lib/exmh-2.0zeta/flist.tcl
+lib/exmh-2.0zeta/folder.tcl
+lib/exmh-2.0zeta/folderNew.tcl
+lib/exmh-2.0zeta/fontsel.tcl
+lib/exmh-2.0zeta/ftoc.tcl
+lib/exmh-2.0zeta/ftocColor.tcl
+lib/exmh-2.0zeta/ftocFind.tcl
+lib/exmh-2.0zeta/getnews.tcl
+lib/exmh-2.0zeta/glimpse.tcl
+lib/exmh-2.0zeta/help.tcl
+lib/exmh-2.0zeta/hourglass.bitmap
+lib/exmh-2.0zeta/hourglass.mask
+lib/exmh-2.0zeta/hourglass1.bitmap
+lib/exmh-2.0zeta/hourglass2.bitmap
+lib/exmh-2.0zeta/hourglass2.mask
+lib/exmh-2.0zeta/html.tcl
+lib/exmh-2.0zeta/html/AddrEdit.html
+lib/exmh-2.0zeta/html/AddressBk.html
+lib/exmh-2.0zeta/html/AliasAddr.html
+lib/exmh-2.0zeta/html/Aliases.html
+lib/exmh-2.0zeta/html/Bindings.html
+lib/exmh-2.0zeta/html/Font.html
+lib/exmh-2.0zeta/html/Import.html
+lib/exmh-2.0zeta/html/Intro.html
+lib/exmh-2.0zeta/html/Keys.html
+lib/exmh-2.0zeta/html/Lists.html
+lib/exmh-2.0zeta/html/PGP.html
+lib/exmh-2.0zeta/html/Preferences.html
+lib/exmh-2.0zeta/html/Reply.html
+lib/exmh-2.0zeta/html/Search.html
+lib/exmh-2.0zeta/html/Sedit.html
+lib/exmh-2.0zeta/html/Seditpref.html
+lib/exmh-2.0zeta/html/blu-ball.gif
+lib/exmh-2.0zeta/html/copyright.html
+lib/exmh-2.0zeta/html/exmh-custom.n.html
+lib/exmh-2.0zeta/html/exmh-fans.html
+lib/exmh-2.0zeta/html/exmh-faq.html
+lib/exmh-2.0zeta/html/exmh-ref.n.html
+lib/exmh-2.0zeta/html/exmh-use.n.html
+lib/exmh-2.0zeta/html/exmh.README.html
+lib/exmh-2.0zeta/html/exmh.n.html
+lib/exmh-2.0zeta/html/exmh.pref.gif
+lib/exmh-2.0zeta/html/exmh.snap1.gif
+lib/exmh-2.0zeta/html/index.html
+lib/exmh-2.0zeta/html/left-arrow.gif
+lib/exmh-2.0zeta/html/maillist.html
+lib/exmh-2.0zeta/html/overview.html
+lib/exmh-2.0zeta/html/red-ball.gif
+lib/exmh-2.0zeta/html/right-arrow.gif
+lib/exmh-2.0zeta/html/software.html
+lib/exmh-2.0zeta/html/whatis.html
+lib/exmh-2.0zeta/html/yel-ball.gif
+lib/exmh-2.0zeta/html_cache.tcl
+lib/exmh-2.0zeta/html_content.tcl
+lib/exmh-2.0zeta/html_dpackage.tcl
+lib/exmh-2.0zeta/html_formtag.tcl
+lib/exmh-2.0zeta/html_frame.tcl
+lib/exmh-2.0zeta/html_get_http.tcl
+lib/exmh-2.0zeta/html_head.tcl
+lib/exmh-2.0zeta/html_hr.tcl
+lib/exmh-2.0zeta/html_images.tcl
+lib/exmh-2.0zeta/html_links.tcl
+lib/exmh-2.0zeta/html_maps.tcl
+lib/exmh-2.0zeta/html_stubs.tcl
+lib/exmh-2.0zeta/html_tags.tcl
+lib/exmh-2.0zeta/html_text.tcl
+lib/exmh-2.0zeta/http_proxy.tcl
+lib/exmh-2.0zeta/import.tcl
+lib/exmh-2.0zeta/inc.tcl
+lib/exmh-2.0zeta/ispell.tcl
+lib/exmh-2.0zeta/labels.tcl
+lib/exmh-2.0zeta/linethru.bitmap
+lib/exmh-2.0zeta/mailcap.tcl
+lib/exmh-2.0zeta/main.tcl
+lib/exmh-2.0zeta/mbempty.bitmap
+lib/exmh-2.0zeta/mbtidy.bitmap
+lib/exmh-2.0zeta/mbuntidy.bitmap
+lib/exmh-2.0zeta/mh.tcl
+lib/exmh-2.0zeta/mime.tcl
+lib/exmh-2.0zeta/mime.types
+lib/exmh-2.0zeta/mimeSun.tcl
+lib/exmh-2.0zeta/mosaic.tcl
+lib/exmh-2.0zeta/msg.tcl
+lib/exmh-2.0zeta/msgShow.tcl
+lib/exmh-2.0zeta/partial.tcl
+lib/exmh-2.0zeta/pgp.tcl
+lib/exmh-2.0zeta/pgpEWN.tcl
+lib/exmh-2.0zeta/pgpExec.tcl
+lib/exmh-2.0zeta/pgpMatch.tcl
+lib/exmh-2.0zeta/pgpMisc.tcl
+lib/exmh-2.0zeta/pgpwww.tcl
+lib/exmh-2.0zeta/pick.tcl
+lib/exmh-2.0zeta/post.tcl
+lib/exmh-2.0zeta/preferences.tcl
+lib/exmh-2.0zeta/print.tcl
+lib/exmh-2.0zeta/ps.tcl
+lib/exmh-2.0zeta/quote.tcl
+lib/exmh-2.0zeta/receipt.tcl
+lib/exmh-2.0zeta/report.tcl
+lib/exmh-2.0zeta/rich2tk.tcl
+lib/exmh-2.0zeta/scan.tcl
+lib/exmh-2.0zeta/sedit.tcl
+lib/exmh-2.0zeta/seditBind.tcl
+lib/exmh-2.0zeta/seditCompose.tcl
+lib/exmh-2.0zeta/seditEnriched.tcl
+lib/exmh-2.0zeta/seditExtras.tcl
+lib/exmh-2.0zeta/seditMime.tcl
+lib/exmh-2.0zeta/seditQP.tcl
+lib/exmh-2.0zeta/seditSel.tcl
+lib/exmh-2.0zeta/select.tcl
+lib/exmh-2.0zeta/send.tcl
+lib/exmh-2.0zeta/sound.tcl
+lib/exmh-2.0zeta/tclIndex
+lib/exmh-2.0zeta/text.tcl
+lib/exmh-2.0zeta/textButton.tcl
+lib/exmh-2.0zeta/textSelect.tcl
+lib/exmh-2.0zeta/thread.tcl
+lib/exmh-2.0zeta/timer.bitmap
+lib/exmh-2.0zeta/tioga.tcl
+lib/exmh-2.0zeta/unseenwin.tcl
+lib/exmh-2.0zeta/uri.tcl
+lib/exmh-2.0zeta/url.bitmap
+lib/exmh-2.0zeta/user.tcl
+lib/exmh-2.0zeta/utils.tcl
+lib/exmh-2.0zeta/widgetMenu.tcl
+lib/exmh-2.0zeta/widgetText.tcl
+lib/exmh-2.0zeta/widgets.tcl
+lib/exmh-2.0zeta/xns.tcl
+lib/exmh-2.0zeta/xnsgetmail.exp
 man/man1/exmh.1.gz
-@dirrm lib/exmh-2.0delta/html
-@dirrm lib/exmh-2.0delta
+@dirrm lib/exmh-2.0zeta/html
+@dirrm lib/exmh-2.0zeta