diff --git a/x11-fm/rox-session/Makefile b/x11-fm/rox-session/Makefile
index 4a5921ab8a2e..0adf76067572 100644
--- a/x11-fm/rox-session/Makefile
+++ b/x11-fm/rox-session/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	rox-session
-PORTVERSION=	0.1.16
+PORTVERSION=	0.1.18
 CATEGORIES=	x11-fm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	rox
@@ -21,14 +21,24 @@ RUN_DEPENDS=	${LOCALBASE}/bin/rox:${PORTSDIR}/x11-fm/rox-filer
 
 WRKSRC=		${WRKDIR}/ROX-Session-${PORTVERSION}
 
+.include <bsd.port.pre.mk>
+
+.if (${ARCH} == "i386")
+BINARIES=	FreeBSD-ix86
+.else
+BINARIES=	FreeBSD-${ARCH}
+.endif
+
+PLIST_SUB=	BINARIES="${BINARIES}"
+
 do-build:
 	# Run the custom build procedure
 	@cd ${WRKSRC}/ROX-Session && GTK_CONFIG=${GTK_CONFIG} GLIB_CONFIG=${GLIB_CONFIG} ./AppRun --compile
 
 do-install:
 	@${MKDIR} ${PREFIX}/apps/ROX-Session
-	@cd ${WRKSRC}/ROX-Session && ${CP} -r AppIcon.xpm AppInfo.xml AppRun FreeBSD-ix86 Help Login MakeDefault.sh Options.xml Setup Styles WindowMans ${PREFIX}/apps/ROX-Session
+	@cd ${WRKSRC}/ROX-Session && ${CP} -r .DirIcon AppInfo.xml AppRun ${BINARIES} Help Login MakeDefault.sh Messages Options.xml Setup SetupPanel Styles WindowMans images ${PREFIX}/apps/ROX-Session
 	@${CAT} ${FILESDIR}/rox-session | ${SED} -e "s|%%PREFIX%%|${PREFIX}|" > ${PREFIX}/bin/rox-session
 	@${CHMOD} 775 ${PREFIX}/bin/rox-session
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11-fm/rox-session/distinfo b/x11-fm/rox-session/distinfo
index 15ff18b8156d..914ed222bf04 100644
--- a/x11-fm/rox-session/distinfo
+++ b/x11-fm/rox-session/distinfo
@@ -1 +1 @@
-MD5 (ROX-Session-0.1.16.tgz) = f172d50127f4444a7ce59114f5e8178c
+MD5 (ROX-Session-0.1.18.tgz) = 8a800d844b6b81b232578844217fde91
diff --git a/x11-fm/rox-session/pkg-plist b/x11-fm/rox-session/pkg-plist
index 3b6a5678706c..1a045a8309ac 100644
--- a/x11-fm/rox-session/pkg-plist
+++ b/x11-fm/rox-session/pkg-plist
@@ -1,18 +1,55 @@
-apps/ROX-Session/AppIcon.xpm
+apps/ROX-Session/.DirIcon
 apps/ROX-Session/AppInfo.xml
 apps/ROX-Session/AppRun
-apps/ROX-Session/FreeBSD-ix86/ROX-Session
+apps/ROX-Session/%%BINARIES%%/ROX-Session
 apps/ROX-Session/Help/COPYING
 apps/ROX-Session/Help/Changes
+apps/ROX-Session/Help/Guide/.DirIcon
+apps/ROX-Session/Help/Guide/AppInfo.xml
+apps/ROX-Session/Help/Guide/AppRun
+apps/ROX-Session/Help/Guide/Guide.html
+apps/ROX-Session/Help/Guide/Tutorial.html
+apps/ROX-Session/Help/Guide/Tutorial2.html
+apps/ROX-Session/Help/Guide/applets.png
+apps/ROX-Session/Help/Guide/apps.png
+apps/ROX-Session/Help/Guide/archive.png
+apps/ROX-Session/Help/Guide/de/Anleitung.html
+apps/ROX-Session/Help/Guide/de/Leitfaden.html
+apps/ROX-Session/Help/Guide/de/apps.png
+apps/ROX-Session/Help/Guide/de/help.png
+apps/ROX-Session/Help/Guide/de/logout.png
+apps/ROX-Session/Help/Guide/de/mount.png
+apps/ROX-Session/Help/Guide/de/newdir.png
+apps/ROX-Session/Help/Guide/de/shortcut.png
+apps/ROX-Session/Help/Guide/edit.png
+apps/ROX-Session/Help/Guide/help.png
+apps/ROX-Session/Help/Guide/logout.png
+apps/ROX-Session/Help/Guide/mount.png
+apps/ROX-Session/Help/Guide/newdir.png
+apps/ROX-Session/Help/Guide/panel1.png
+apps/ROX-Session/Help/Guide/runaction.png
+apps/ROX-Session/Help/Guide/save.png
+apps/ROX-Session/Help/Guide/shortcut.png
+apps/ROX-Session/Help/Guide/style.css
 apps/ROX-Session/Help/README
 apps/ROX-Session/Login
 apps/ROX-Session/MakeDefault.sh
+apps/ROX-Session/Messages/da.gmo
+apps/ROX-Session/Messages/de.gmo
+apps/ROX-Session/Messages/nl.gmo
 apps/ROX-Session/Options.xml
 apps/ROX-Session/Setup
+apps/ROX-Session/SetupPanel
 apps/ROX-Session/Styles
 apps/ROX-Session/WindowMans
+apps/ROX-Session/images/rox-halt.png
+apps/ROX-Session/images/rox-suspend.png
 bin/rox-session
+@dirrm apps/ROX-Session/images
+@dirrm apps/ROX-Session/Messages
+@dirrm apps/ROX-Session/Help/Guide/de
+@dirrm apps/ROX-Session/Help/Guide
 @dirrm apps/ROX-Session/Help
-@dirrm apps/ROX-Session/FreeBSD-ix86
+@dirrm apps/ROX-Session/%%BINARIES%%
 @dirrm apps/ROX-Session
 @unexec rmdir %D/apps 2>/dev/null || true