diff --git a/games/xmoto/Makefile b/games/xmoto/Makefile
index cf48cd642f7..82da7c9c70a 100644
--- a/games/xmoto/Makefile
+++ b/games/xmoto/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.16 2014/01/16 10:25:54 kirby Exp $
+# $OpenBSD: Makefile,v 1.17 2014/07/08 11:11:15 kirby Exp $
 
 COMMENT =	challenging 2D motocross platform game
 
 V =	 	0.5.10
 DISTNAME =	xmoto-${V}-src
 PKGNAME =	xmoto-${V}
+REVISION = 	0
 CATEGORIES =	games
 
 MAINTAINER =	Antti Harri <iku@openbsd.fi>
@@ -34,9 +35,9 @@ LIB_DEPENDS =	archivers/bzip2 \
 		textproc/libxml \
 		x11/libxdg-basedir \
 		${MODLUA_LIB_DEPENDS}
+RUN_DEPENDS = 	devel/desktop-file-utils
 
 SEPARATE_BUILD =	Yes
-USE_GROFF =		Yes
 
 CONFIGURE_STYLE =	gnu
 CONFIGURE_ENV =		CPPFLAGS="`pkg-config --cflags libpng sqlite3 sdl ${MODLUA_DEP}` -DSVN_REV='\"${V}\"'" \
@@ -57,5 +58,9 @@ pre-configure:
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xmoto/
 	${INSTALL_DATA} ${WRKSRC}/{COPYING,README} ${PREFIX}/share/doc/xmoto/
+	${INSTALL_DATA_DIR} ${PREFIX}/share/applications/
+	${INSTALL_DATA} ${WRKSRC}/extra/xmoto.desktop ${PREFIX}/share/applications
+	${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps
+	${INSTALL_DATA} ${WRKSRC}/extra/xmoto.xpm ${PREFIX}/share/pixmaps
 
 .include <bsd.port.mk>
diff --git a/games/xmoto/patches/patch-src_image_tim_png_cpp b/games/xmoto/patches/patch-src_image_tim_png_cpp
deleted file mode 100644
index f06c119516c..00000000000
--- a/games/xmoto/patches/patch-src_image_tim_png_cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-$OpenBSD: patch-src_image_tim_png_cpp,v 1.3 2012/04/15 08:49:05 kirby Exp $
---- src/image/tim_png.cpp.orig	Sat Sep 10 22:36:28 2011
-+++ src/image/tim_png.cpp	Sat Sep 10 22:37:51 2011
-@@ -24,6 +24,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, 
-  */
- #include <stdio.h>
- #include <string.h>
-+#include <zlib.h>
- #include "tim.h"
- #include "png.h"
- 
diff --git a/games/xmoto/patches/patch-xmoto_6 b/games/xmoto/patches/patch-xmoto_6
new file mode 100644
index 00000000000..07af9f8f039
--- /dev/null
+++ b/games/xmoto/patches/patch-xmoto_6
@@ -0,0 +1,20 @@
+$OpenBSD: patch-xmoto_6,v 1.1 2014/07/08 11:11:15 kirby Exp $
+--- xmoto.6.orig	Tue Jul  8 14:59:57 2014
++++ xmoto.6	Tue Jul  8 15:00:47 2014
+@@ -265,13 +265,13 @@ Change video size (1=full, 2=50%, 4=25%).
+ .B      --videoRecordingFramerate FRAMERATE
+ Change video framerate.
+ .TP
+-.B	--videoRecordingStartTime NBCENTSOFSECONDS
++.B      --videoRecordingStartTime NBCENTSOFSECONDS
+ Start recording video after NBCENTSOFSECONDS time elapsed.
+ .TP
+-.B	--videoRecordingEndTime NBCENTSOFSECONDS
++.B      --videoRecordingEndTime NBCENTSOFSECONDS
+ Stop recording video after NBCENTSOFSECONDS time elapsed.
+ .TP
+-.B	--hidePlayingInformation
++.B      --hidePlayingInformation
+ Don't show some information while playing/replaying ; usefull to make nicer video.
+ 
+ .SH EXAMPLES
diff --git a/games/xmoto/pkg/PLIST b/games/xmoto/pkg/PLIST
index 919d4ddda38..1d1b22e9622 100644
--- a/games/xmoto/pkg/PLIST
+++ b/games/xmoto/pkg/PLIST
@@ -1,6 +1,7 @@
-@comment $OpenBSD: PLIST,v 1.3 2012/04/15 08:49:05 kirby Exp $
+@comment $OpenBSD: PLIST,v 1.4 2014/07/08 11:11:15 kirby Exp $
 @bin bin/xmoto
 @man man/man6/xmoto.6
+share/applications/xmoto.desktop
 share/doc/xmoto/
 share/doc/xmoto/COPYING
 share/doc/xmoto/README
@@ -78,6 +79,8 @@ share/locale/tr_TR/
 share/locale/tr_TR/LC_MESSAGES/
 share/locale/tr_TR/LC_MESSAGES/xmoto.mo
 share/locale/zh_TW/LC_MESSAGES/xmoto.mo
+share/pixmaps/
+share/pixmaps/xmoto.xpm
 share/xmoto/
 share/xmoto/Textures/
 share/xmoto/Textures/Fonts/
@@ -92,4 +95,6 @@ share/xmoto/Textures/Musics/menu.ogg
 share/xmoto/Textures/Musics/ridealong.ogg
 share/xmoto/Textures/Musics/speeditup.ogg
 share/xmoto/xmoto.bin
-share/xmoto/xmoto_icone_x.ico
+@comment share/xmoto/xmoto_icone_x.ico
+@exec %D/bin/update-desktop-database
+@unexec-delete %D/bin/update-desktop-database