diff --git a/archivers/xarchiver/Makefile b/archivers/xarchiver/Makefile
index 6cabeb3a667f..75eb64d4cb77 100644
--- a/archivers/xarchiver/Makefile
+++ b/archivers/xarchiver/Makefile
@@ -1,50 +1,46 @@
 # Created by: Andreev Maxim
 # $FreeBSD$
 
 PORTNAME=	xarchiver
-PORTVERSION=	0.5.2
-PORTREVISION=	6
+PORTVERSION=	0.5.3
 CATEGORIES=	archivers
 MASTER_SITES=	SF
+MASTER_SITE_SUBDIR=	${PORTNAME:L}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Desktop-agnostic GTK+2 frontend to various archiving tools
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils
+RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils \
+	7zr:${PORTSDIR}/archivers/p7zip \
+	zip:${PORTSDIR}/archivers/zip
 
 USES=		gmake pkgconfig desktop-file-utils
 USE_BZIP2=	yes
 USE_GNOME=	glib20 gtk20 intltool
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 
 OPTIONS_DEFINE=	DOCS NLS
 
 .include <bsd.port.options.mk>
 
 .if !empty(PORT_OPTIONS:MNLS)
 USES+=		gettext
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 PLIST_SUB+=	NLS=""
 .else
 PLIST_SUB+=	NLS="@comment "
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|;multipart/x-zip||' \
-		${WRKSRC}/xarchiver.desktop.in
-
 .if ! ${PORT_OPTIONS:MDOCS}
 	@${REINPLACE_CMD} -e 's|doc||g' ${WRKSRC}/Makefile.in
 .endif
 .if empty(PORT_OPTIONS:MNLS)
 	@${REINPLACE_CMD} -e 's| po | |g' ${WRKSRC}/Makefile.in
 .endif
 
-post-install:
-	@-update-desktop-database
-
 .include <bsd.port.mk>
diff --git a/archivers/xarchiver/distinfo b/archivers/xarchiver/distinfo
index fe8a25582b51..4fa9037178b4 100644
--- a/archivers/xarchiver/distinfo
+++ b/archivers/xarchiver/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xarchiver-0.5.2.tar.bz2) = cea932ff9d505969201fd502470bbebbc5726ab3d6765e142fc8295aa677ad2a
-SIZE (xarchiver-0.5.2.tar.bz2) = 755418
+SHA256 (xarchiver-0.5.3.tar.bz2) = c5899cb495e83a63f89b5eea002d2dd1c691db8d7b6343b3c182ce6e00c16d81
+SIZE (xarchiver-0.5.3.tar.bz2) = 778871
diff --git a/archivers/xarchiver/pkg-plist b/archivers/xarchiver/pkg-plist
index e659cdc70d1e..c12922cc4986 100644
--- a/archivers/xarchiver/pkg-plist
+++ b/archivers/xarchiver/pkg-plist
@@ -1,81 +1,79 @@
 bin/xarchiver
 libexec/thunar-archive-plugin/xarchiver.tap
 share/applications/xarchiver.desktop
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 %%PORTDOCS%%%%DOCSDIR%%/html/ch01.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ch01s02.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ch01s03.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ch01s04.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ch02.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ch02s02.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ch02s03.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ch03.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ch03s02.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ch03s03.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ch03s04.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ch03s05.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ch03s06.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ch03s07.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ch03s08.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ch03s09.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ch04.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ch04s02.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ch04s03.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ch04s04.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ch04s05.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ch04s06.html
 %%PORTDOCS%%%%DOCSDIR%%/html/images/add_dialog.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/archive_comment_dialog.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/archive_properties.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/extract_dialog.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/multi_extract_dialog.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/new_dialog.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/password_dialog.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog.png
 %%PORTDOCS%%%%DOCSDIR%%/html/index.html
 %%PORTDOCS%%%%DOCSDIR%%/html/xarchiver.css
 share/icons/hicolor/16x16/apps/xarchiver.png
 share/icons/hicolor/24x24/apps/xarchiver.png
 share/icons/hicolor/48x48/apps/xarchiver.png
 share/icons/hicolor/scalable/apps/xarchiver.svg
 %%NLS%%share/locale/bg/LC_MESSAGES/xarchiver.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/xarchiver.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/xarchiver.mo
 %%NLS%%share/locale/da/LC_MESSAGES/xarchiver.mo
 %%NLS%%share/locale/de/LC_MESSAGES/xarchiver.mo
 %%NLS%%share/locale/el/LC_MESSAGES/xarchiver.mo
 %%NLS%%share/locale/en_GB/LC_MESSAGES/xarchiver.mo
 %%NLS%%share/locale/es/LC_MESSAGES/xarchiver.mo
 %%NLS%%share/locale/eu/LC_MESSAGES/xarchiver.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/xarchiver.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/xarchiver.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/xarchiver.mo
 %%NLS%%share/locale/id/LC_MESSAGES/xarchiver.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/xarchiver.mo
 %%NLS%%share/locale/nb_NO/LC_MESSAGES/xarchiver.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/xarchiver.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/xarchiver.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/xarchiver.mo
 %%NLS%%share/locale/pt_PT/LC_MESSAGES/xarchiver.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/xarchiver.mo
 %%NLS%%share/locale/sq/LC_MESSAGES/xarchiver.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/xarchiver.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/xarchiver.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/xarchiver.mo
 share/pixmaps/xarchiver/xarchiver-add.png
 share/pixmaps/xarchiver/xarchiver-extract.png
 share/pixmaps/xarchiver/xarchiver-html.png
-%%NLS%%@dirrm share/locale/nb_NO/LC_MESSAGES
-%%NLS%%@dirrm share/locale/nb_NO
+%%NLS%%@dirrmtry share/locale/nb_NO/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/nb_NO
 @dirrm share/pixmaps/xarchiver
 @dirrmtry libexec/thunar-archive-plugin
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html/images
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true