diff --git a/comms/xlog/Makefile b/comms/xlog/Makefile
index c5503bdb5eb1..7e5ce25e3e89 100644
--- a/comms/xlog/Makefile
+++ b/comms/xlog/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	comms hamradio
 MASTER_SITES=	SAVANNAH
 MASTER_SITE_SUBDIR=	xlog
 
-MAINTAINER=	danilogondolfo@gmail.com
+MAINTAINER=	danilo@FreeBSD.org
 COMMENT=	Amateur Radio logging application
 
 LICENSE=	GPLv3
@@ -17,29 +17,20 @@ USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-mime-update
 CONFIGURE_ENV+=	ac_cv_c_compiler_gnu=no
+MAKE_ARGS=	PREFIX=/${PREFIX}
 
-PORTDOCS=	*
-
-LIB_DEPENDS+=	hamlib:${PORTSDIR}/comms/hamlib
-
-MAN1=		xlog.1
+LIB_DEPENDS=	libhamlib.so:${PORTSDIR}/comms/hamlib
 
 OPTIONS_DEFINE=	NLS DOCS
-
 OPTIONS_SUB=	yes
 NLS_USES=	gettext
 NLS_CONFIGURE_OFF=	--disable-nls
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
+DESKTOP_ENTRIES="${PORTNAME}" "${COMMENT}" "${PORTNAME}.xpm" \
+	"${PORTNAME}" "Utility;" ${FALSE}
 
 post-patch:
-.if ! ${PORT_OPTIONS:MDOCS}
-	@${REINPLACE_CMD} -e 's|desktop doc dxcc|desktop dxcc|g' \
-	${WRKSRC}/data/Makefile.in
-	@${REINPLACE_CMD} -e \
-	's|install-data-am: install-glabelsDATA|install-data-am:|g' \
-	${WRKSRC}/data/glabels/Makefile.in
-.endif
+	${REINPLACE_CMD} -e 's/@INSTALL_DATA@/${INSTALL} -m 644/' \
+		${WRKSRC}/data/desktop/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/comms/xlog/pkg-descr b/comms/xlog/pkg-descr
index e633eb105da1..b4f39ff46ba1 100644
--- a/comms/xlog/pkg-descr
+++ b/comms/xlog/pkg-descr
@@ -4,7 +4,8 @@ location in latitude and longitude and distance and heading in
 kilometers or miles, both for short and long path. Locator distance
 and heading calculation for VHF logging is also supported.
 
-Xlog supports cabrillo and ADIF and can import twlog and editest files.
+Xlog supports cabrillo, ADIF, trlog, and EDI and can import 
+twlog, editest and OH1AA logbook files.
 It also has the ability to customise log fields which makes it ideal for
 use in those countries that have odd logging rules such as the U.K. Also
 included is the ability to log using the FCC emissions codes.
diff --git a/comms/xlog/pkg-plist b/comms/xlog/pkg-plist
index 7c0e39a48b4f..f4b45e6d78ff 100644
--- a/comms/xlog/pkg-plist
+++ b/comms/xlog/pkg-plist
@@ -1,32 +1,129 @@
 bin/xlog
-share/pixmaps/xlog/xlog.svg
-share/pixmaps/xlog/xlog-icon.png
-share/pixmaps/xlog/xlog.png
-share/pixmaps/xlog/xlog-keyer.png
-share/pixmaps/xlog/xlog-b4.png
-share/pixmaps/xlog/xlog-map.png
-share/pixmaps/xlog/xlog-scoring.png
-share/pixmaps/xlog/gnome-mime-text-x-xlog.png
-share/pixmaps/xlog/xlog.xpm
-share/pixmaps/xlog/mini-clock.xpm
-share/pixmaps/xlog/mini-trx.xpm
-share/pixmaps/xlog/mini-xlog.xpm
-share/pixmaps/xlog/s0.xpm
-share/pixmaps/xlog/s1.xpm
-share/pixmaps/xlog/s2.xpm
-share/pixmaps/xlog/s3.xpm
-share/pixmaps/xlog/s4.xpm
-share/pixmaps/xlog/s5.xpm
-share/pixmaps/xlog/s6.xpm
-share/pixmaps/xlog/s7.xpm
-share/pixmaps/xlog/s8.xpm
-share/pixmaps/xlog/s9.xpm
-share/pixmaps/xlog/s-meter.xpm
-share/pixmaps/xlog/s.xpm
-share/pixmaps/xlog/cwdaemon.png
-share/pixmaps/xlog/jigsaw.png
-share/pixmaps/xlog/countrymap.png
-share/applications/xlog.desktop
+man/man1/xlog.1.gz
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/BUGS
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/KEYS
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/glabels/qsllabels.glabels
+%%PORTDOCS%%%%DOCSDIR%%/manual/README
+%%PORTDOCS%%%%DOCSDIR%%/manual/appendix-bands.dox
+%%PORTDOCS%%%%DOCSDIR%%/manual/appendix-keys.dox
+%%PORTDOCS%%%%DOCSDIR%%/manual/appendix-modes.dox
+%%PORTDOCS%%%%DOCSDIR%%/manual/appendix-prosigns.dox
+%%PORTDOCS%%%%DOCSDIR%%/manual/appendix-qcodes.dox
+%%PORTDOCS%%%%DOCSDIR%%/manual/dialogs-and-windows.dox
+%%PORTDOCS%%%%DOCSDIR%%/manual/getting_started.dox
+%%PORTDOCS%%%%DOCSDIR%%/manual/intro.dox
+%%PORTDOCS%%%%DOCSDIR%%/manual/keyer.dox
+%%PORTDOCS%%%%DOCSDIR%%/manual/license.dox
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/appendix-bands.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/appendix-keys.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/appendix-modes.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/appendix-prosigns.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/appendix-qcodes.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/bc_s.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/bdwn.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/closed.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/dialogs-and-windows.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/doxygen.css
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/doxygen.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/dynsections.js
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/ftv2blank.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/ftv2cl.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/ftv2doc.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/ftv2folderclosed.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/ftv2folderopen.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/ftv2lastnode.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/ftv2link.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/ftv2mlastnode.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/ftv2mnode.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/ftv2mo.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/ftv2node.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/ftv2ns.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/ftv2plastnode.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/ftv2pnode.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/ftv2splitbar.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/ftv2vertline.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/getting-started.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/index.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/jquery.js
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/keyer.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/license.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/nav_f.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/nav_g.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/nav_h.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/navtree.css
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/navtree.js
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/navtreeindex0.js
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/open.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/pages.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/preferences.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/resize.js
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/search/all_61.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/search/all_61.js
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/search/all_64.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/search/all_64.js
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/search/all_67.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/search/all_67.js
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/search/all_69.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/search/all_69.js
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/search/all_6b.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/search/all_6b.js
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/search/all_6c.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/search/all_6c.js
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/search/all_70.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/search/all_70.js
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/search/close.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/search/mag_sel.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/search/nomatches.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/search/pages_61.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/search/pages_61.js
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/search/pages_64.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/search/pages_64.js
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/search/pages_67.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/search/pages_67.js
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/search/pages_69.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/search/pages_69.js
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/search/pages_6b.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/search/pages_6b.js
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/search/pages_6c.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/search/pages_6c.js
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/search/pages_70.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/search/pages_70.js
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/search/search.css
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/search/search.js
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/search/search_l.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/search/search_m.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/search/search_r.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/sync_off.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/sync_on.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/tab_a.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/tab_b.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/tab_h.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/tab_s.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/tabs.css
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/xlog-clock.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/xlog-dialogs-export.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/xlog-dialogs-scoring.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/xlog-dialogs-workedbefore.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/xlog-dropdown.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/xlog-editbox.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/xlog-keyer.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/xlog-large.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/xlog-prefs-general.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/xlog-prefs-hamlib.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/xlog-prefs-info.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/xlog-prefs-logs.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/xlog.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/output/html/xlog_manual.css
+%%PORTDOCS%%%%DOCSDIR%%/manual/preferences.dox
+%%PORTDOCS%%%%DOCSDIR%%/manual/xlog.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/xlog_manual.css
+%%PORTDOCS%%%%DOCSDIR%%/manual/xlog_user.doxy
+%%PORTDOCS%%%%DOCSDIR%%/manual/xlog_user.txt
+share/icons/gnome-mime-text-x-xlog.png
+share/icons/xlog-icon.png
 %%NLS%%share/locale/cs/LC_MESSAGES/xlog.mo
 %%NLS%%share/locale/de/LC_MESSAGES/xlog.mo
 %%NLS%%share/locale/es/LC_MESSAGES/xlog.mo
@@ -37,33 +134,37 @@ share/applications/xlog.desktop
 %%NLS%%share/locale/pt/LC_MESSAGES/xlog.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/xlog.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/xlog.mo
-%%DATADIR%%/dxcc/cty.dat
+share/mime/packages/xlog.xml
+share/mime/text/x-xlog.xml
+share/pixmaps/xlog/countrymap.png
+share/pixmaps/xlog/cwdaemon.png
+share/pixmaps/xlog/gnome-mime-text-x-xlog.png
+share/pixmaps/xlog/jigsaw.png
+share/pixmaps/xlog/mini-clock.xpm
+share/pixmaps/xlog/mini-trx.xpm
+share/pixmaps/xlog/mini-xlog.xpm
+share/pixmaps/xlog/s-meter.xpm
+share/pixmaps/xlog/s.xpm
+share/pixmaps/xlog/s0.xpm
+share/pixmaps/xlog/s1.xpm
+share/pixmaps/xlog/s2.xpm
+share/pixmaps/xlog/s3.xpm
+share/pixmaps/xlog/s4.xpm
+share/pixmaps/xlog/s5.xpm
+share/pixmaps/xlog/s6.xpm
+share/pixmaps/xlog/s7.xpm
+share/pixmaps/xlog/s8.xpm
+share/pixmaps/xlog/s9.xpm
+share/pixmaps/xlog/xlog-b4.png
+share/pixmaps/xlog/xlog-icon.png
+share/pixmaps/xlog/xlog-keyer.png
+share/pixmaps/xlog/xlog-map.png
+share/pixmaps/xlog/xlog-scoring.png
+share/pixmaps/xlog/xlog.png
+share/pixmaps/xlog/xlog.svg
+share/pixmaps/xlog/xlog.xpm
 %%DATADIR%%/dxcc/area.dat
-%%DATADIR%%/maps/3D2/c.png
-%%DATADIR%%/maps/3D2/r.png
-%%DATADIR%%/maps/3Y/b.png
-%%DATADIR%%/maps/3Y/p.png
-%%DATADIR%%/maps/E5/n.png
-%%DATADIR%%/maps/E5/s.png
-%%DATADIR%%/maps/FO/a.png
-%%DATADIR%%/maps/FO/c.png
-%%DATADIR%%/maps/FO/m.png
-%%DATADIR%%/maps/FK/c.png
-%%DATADIR%%/maps/FR/g.png
-%%DATADIR%%/maps/FR/j.png
-%%DATADIR%%/maps/FR/t.png
-%%DATADIR%%/maps/HK0/a.png
-%%DATADIR%%/maps/HK0/m.png
-%%DATADIR%%/maps/JD/m.png
-%%DATADIR%%/maps/JD/o.png
-%%DATADIR%%/maps/KH8/s.png
-%%DATADIR%%/maps/SV/a.png
-%%DATADIR%%/maps/VP6/d.png
-%%DATADIR%%/maps/VP8/g.png
-%%DATADIR%%/maps/VP8/h.png
-%%DATADIR%%/maps/VP8/o.png
-%%DATADIR%%/maps/VP8/s.png
-%%DATADIR%%/maps/worldmap.jpg
+%%DATADIR%%/dxcc/cty.dat
 %%DATADIR%%/maps/1S.png
 %%DATADIR%%/maps/3A.png
 %%DATADIR%%/maps/3B6.png
@@ -72,10 +173,14 @@ share/applications/xlog.desktop
 %%DATADIR%%/maps/3C.png
 %%DATADIR%%/maps/3C0.png
 %%DATADIR%%/maps/3D2.png
+%%DATADIR%%/maps/3D2/c.png
+%%DATADIR%%/maps/3D2/r.png
 %%DATADIR%%/maps/3DA.png
 %%DATADIR%%/maps/3V.png
 %%DATADIR%%/maps/3W.png
 %%DATADIR%%/maps/3X.png
+%%DATADIR%%/maps/3Y/b.png
+%%DATADIR%%/maps/3Y/p.png
 %%DATADIR%%/maps/4J.png
 %%DATADIR%%/maps/4L.png
 %%DATADIR%%/maps/4O.png
@@ -147,8 +252,8 @@ share/applications/xlog.desktop
 %%DATADIR%%/maps/CT3.png
 %%DATADIR%%/maps/CU.png
 %%DATADIR%%/maps/CX.png
-%%DATADIR%%/maps/CY9.png
 %%DATADIR%%/maps/CY0.png
+%%DATADIR%%/maps/CY9.png
 %%DATADIR%%/maps/D2.png
 %%DATADIR%%/maps/D4.png
 %%DATADIR%%/maps/D6.png
@@ -156,6 +261,8 @@ share/applications/xlog.desktop
 %%DATADIR%%/maps/DU.png
 %%DATADIR%%/maps/E3.png
 %%DATADIR%%/maps/E4.png
+%%DATADIR%%/maps/E5/n.png
+%%DATADIR%%/maps/E5/s.png
 %%DATADIR%%/maps/E7.png
 %%DATADIR%%/maps/EA.png
 %%DATADIR%%/maps/EA6.png
@@ -172,15 +279,22 @@ share/applications/xlog.desktop
 %%DATADIR%%/maps/EX.png
 %%DATADIR%%/maps/EY.png
 %%DATADIR%%/maps/EZ.png
+%%DATADIR%%/maps/F.png
 %%DATADIR%%/maps/FG.png
 %%DATADIR%%/maps/FH.png
 %%DATADIR%%/maps/FJ.png
 %%DATADIR%%/maps/FK.png
+%%DATADIR%%/maps/FK/c.png
 %%DATADIR%%/maps/FM.png
 %%DATADIR%%/maps/FO.png
-%%DATADIR%%/maps/F.png
+%%DATADIR%%/maps/FO/a.png
+%%DATADIR%%/maps/FO/c.png
+%%DATADIR%%/maps/FO/m.png
 %%DATADIR%%/maps/FP.png
 %%DATADIR%%/maps/FR.png
+%%DATADIR%%/maps/FR/g.png
+%%DATADIR%%/maps/FR/j.png
+%%DATADIR%%/maps/FR/t.png
 %%DATADIR%%/maps/FS.png
 %%DATADIR%%/maps/FT5W.png
 %%DATADIR%%/maps/FT5X.png
@@ -197,13 +311,15 @@ share/applications/xlog.desktop
 %%DATADIR%%/maps/H4.png
 %%DATADIR%%/maps/H40.png
 %%DATADIR%%/maps/HA.png
-%%DATADIR%%/maps/HB0.png
 %%DATADIR%%/maps/HB.png
+%%DATADIR%%/maps/HB0.png
 %%DATADIR%%/maps/HC.png
 %%DATADIR%%/maps/HC8.png
 %%DATADIR%%/maps/HH.png
 %%DATADIR%%/maps/HI.png
 %%DATADIR%%/maps/HK.png
+%%DATADIR%%/maps/HK0/a.png
+%%DATADIR%%/maps/HK0/m.png
 %%DATADIR%%/maps/HL.png
 %%DATADIR%%/maps/HM.png
 %%DATADIR%%/maps/HP.png
@@ -220,10 +336,13 @@ share/applications/xlog.desktop
 %%DATADIR%%/maps/J7.png
 %%DATADIR%%/maps/J8.png
 %%DATADIR%%/maps/JA.png
+%%DATADIR%%/maps/JD/m.png
+%%DATADIR%%/maps/JD/o.png
 %%DATADIR%%/maps/JT.png
 %%DATADIR%%/maps/JW.png
 %%DATADIR%%/maps/JX.png
 %%DATADIR%%/maps/JY.png
+%%DATADIR%%/maps/K.png
 %%DATADIR%%/maps/KG4.png
 %%DATADIR%%/maps/KH0.png
 %%DATADIR%%/maps/KH1.png
@@ -235,13 +354,13 @@ share/applications/xlog.desktop
 %%DATADIR%%/maps/KH6.png
 %%DATADIR%%/maps/KH7K.png
 %%DATADIR%%/maps/KH8.png
+%%DATADIR%%/maps/KH8/s.png
 %%DATADIR%%/maps/KH9.png
 %%DATADIR%%/maps/KL.png
 %%DATADIR%%/maps/KP1.png
 %%DATADIR%%/maps/KP2.png
 %%DATADIR%%/maps/KP4.png
 %%DATADIR%%/maps/KP5.png
-%%DATADIR%%/maps/K.png
 %%DATADIR%%/maps/LA.png
 %%DATADIR%%/maps/LU.png
 %%DATADIR%%/maps/LX.png
@@ -270,8 +389,8 @@ share/applications/xlog.desktop
 %%DATADIR%%/maps/PY0T.png
 %%DATADIR%%/maps/PZ.png
 %%DATADIR%%/maps/R1FJ.png
-%%DATADIR%%/maps/S0.png
 %%DATADIR%%/maps/R1MV.png
+%%DATADIR%%/maps/S0.png
 %%DATADIR%%/maps/S2.png
 %%DATADIR%%/maps/S5.png
 %%DATADIR%%/maps/S7.png
@@ -281,6 +400,7 @@ share/applications/xlog.desktop
 %%DATADIR%%/maps/ST.png
 %%DATADIR%%/maps/SU.png
 %%DATADIR%%/maps/SV.png
+%%DATADIR%%/maps/SV/a.png
 %%DATADIR%%/maps/SV5.png
 %%DATADIR%%/maps/SV9.png
 %%DATADIR%%/maps/T2.png
@@ -305,9 +425,9 @@ share/applications/xlog.desktop
 %%DATADIR%%/maps/TU.png
 %%DATADIR%%/maps/TY.png
 %%DATADIR%%/maps/TZ.png
+%%DATADIR%%/maps/UA.png
 %%DATADIR%%/maps/UA2.png
 %%DATADIR%%/maps/UA9.png
-%%DATADIR%%/maps/UA.png
 %%DATADIR%%/maps/UK.png
 %%DATADIR%%/maps/UN.png
 %%DATADIR%%/maps/UR.png
@@ -319,6 +439,7 @@ share/applications/xlog.desktop
 %%DATADIR%%/maps/V7.png
 %%DATADIR%%/maps/V8.png
 %%DATADIR%%/maps/VE.png
+%%DATADIR%%/maps/VK.png
 %%DATADIR%%/maps/VK0H.png
 %%DATADIR%%/maps/VK0M.png
 %%DATADIR%%/maps/VK9C.png
@@ -327,13 +448,17 @@ share/applications/xlog.desktop
 %%DATADIR%%/maps/VK9N.png
 %%DATADIR%%/maps/VK9W.png
 %%DATADIR%%/maps/VK9X.png
-%%DATADIR%%/maps/VK.png
 %%DATADIR%%/maps/VP2E.png
 %%DATADIR%%/maps/VP2M.png
 %%DATADIR%%/maps/VP2V.png
 %%DATADIR%%/maps/VP5.png
 %%DATADIR%%/maps/VP6.png
+%%DATADIR%%/maps/VP6/d.png
 %%DATADIR%%/maps/VP8.png
+%%DATADIR%%/maps/VP8/g.png
+%%DATADIR%%/maps/VP8/h.png
+%%DATADIR%%/maps/VP8/o.png
+%%DATADIR%%/maps/VP8/s.png
 %%DATADIR%%/maps/VP9.png
 %%DATADIR%%/maps/VQ9.png
 %%DATADIR%%/maps/VR.png
@@ -377,16 +502,7 @@ share/applications/xlog.desktop
 %%DATADIR%%/maps/ZP.png
 %%DATADIR%%/maps/ZS.png
 %%DATADIR%%/maps/ZS8.png
-share/mime/packages/xlog.xml
-share/mime/text/x-xlog.xml
-share/icons/gnome-mime-text-x-xlog.png
-share/icons/xlog-icon.png
-@dirrm share/pixmaps/xlog
-@dirrmtry share/applications
-@dirrmtry share/icons
-@dirrmtry share/mime/packages
-@dirrmtry share/mime/text
-@dirrmtry share/mime
+%%DATADIR%%/maps/worldmap.jpg
 @dirrmtry %%DATADIR%%/maps/VP8
 @dirrmtry %%DATADIR%%/maps/VP6
 @dirrmtry %%DATADIR%%/maps/SV
@@ -402,3 +518,14 @@ share/icons/xlog-icon.png
 @dirrmtry %%DATADIR%%/maps
 @dirrmtry %%DATADIR%%/dxcc
 @dirrmtry %%DATADIR%%
+@dirrmtry share/pixmaps/xlog
+@dirrmtry share/mime/text
+@dirrmtry share/mime/packages
+@dirrmtry share/mime
+@dirrmtry share/icons
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/manual/output/html/search
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/manual/output/html
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/manual/output
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/manual
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/glabels
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%