diff --git a/geo/merkaartor/Makefile b/geo/merkaartor/Makefile
index 575b12d72b5..45184efc77b 100644
--- a/geo/merkaartor/Makefile
+++ b/geo/merkaartor/Makefile
@@ -1,15 +1,14 @@
-# $OpenBSD: Makefile,v 1.13 2011/12/03 20:30:09 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.14 2012/01/06 16:46:13 landry Exp $
 
 COMMENT =	OpenStreetMap editor
 
-DISTNAME =	merkaartor-0.17.0
-REVISION=	2
+DISTNAME =	merkaartor-0.17.2
 EXTRACT_SUFX =	.tar.bz2
 
 CATEGORIES =	geo x11
 
 HOMEPAGE =	http://www.merkaartor.be/
-MAINTAINER =	Landry Breuil <gaston@gcu.info>
+MAINTAINER =	Landry Breuil <landry@openbsd.org>
 
 # GPLv2
 PERMIT_PACKAGE_CDROM =	Yes
@@ -17,7 +16,7 @@ PERMIT_PACKAGE_FTP =	Yes
 PERMIT_DISTFILES_CDROM =Yes
 PERMIT_DISTFILES_FTP =	Yes
 
-MASTER_SITES =	http://merkaartor.be/attachments/download/192/
+MASTER_SITES =	http://merkaartor.be/attachments/download/253/
 
 NO_REGRESS =	Yes
 MODULES =	devel/gettext x11/qt4
@@ -28,7 +27,7 @@ RUN_DEPENDS =	devel/desktop-file-utils \
 LIB_DEPENDS =	x11/qt4 devel/proj
 
 WANTLIB += QtGui QtNetwork QtSvg QtWebKit QtXml c m proj pthread
-WANTLIB += stdc++ z
+WANTLIB += stdc++ z ICE SM X11 Xext Xi Xinerama Xrender fontconfig freetype
 
 do-configure:
 	cd ${WRKSRC} && env ${CONFIGURE_ENV} qmake4 GDAL=0 PROJ=1 NODEBUG=1 \
diff --git a/geo/merkaartor/distinfo b/geo/merkaartor/distinfo
index 1a579b9986b..9f1fdccb7e7 100644
--- a/geo/merkaartor/distinfo
+++ b/geo/merkaartor/distinfo
@@ -1,5 +1,5 @@
-MD5 (merkaartor-0.17.0.tar.bz2) = AiVX3ikCM7yHm995TN1A8A==
-RMD160 (merkaartor-0.17.0.tar.bz2) = w0K988GcTXbJbGLsmAGz5qUMklQ=
-SHA1 (merkaartor-0.17.0.tar.bz2) = vXoWKmusAHPgW0lg2y2UGuQbbn4=
-SHA256 (merkaartor-0.17.0.tar.bz2) = Uoe3KvULv4i98kwJo+o7aG4pYD64LxRGraQEwpPfNkI=
-SIZE (merkaartor-0.17.0.tar.bz2) = 7138228
+MD5 (merkaartor-0.17.2.tar.bz2) = RMSfc++liaRVu509CihNCQ==
+RMD160 (merkaartor-0.17.2.tar.bz2) = xciUSHKCi6WtpgA81YIfM4mdo8s=
+SHA1 (merkaartor-0.17.2.tar.bz2) = 94kUHbQnvyW7O2GAH+/JirBDABI=
+SHA256 (merkaartor-0.17.2.tar.bz2) = Ql9PrO+/IKPdGgnuYf+KiRJILRowyVfFCGnY/1m6cCo=
+SIZE (merkaartor-0.17.2.tar.bz2) = 7138991
diff --git a/geo/merkaartor/pkg/PLIST b/geo/merkaartor/pkg/PLIST
index 25f090b68ed..23a7cd2ec61 100644
--- a/geo/merkaartor/pkg/PLIST
+++ b/geo/merkaartor/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.5 2011/12/03 20:30:09 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.6 2012/01/06 16:46:13 landry Exp $
 %%SHARED%%
 @bin bin/merkaartor
 lib/merkaartor/
@@ -6,10 +6,6 @@ lib/merkaartor/plugins/
 lib/merkaartor/plugins/background/
 lib/merkaartor/plugins/styles/
 share/applications/merkaartor.desktop
-share/icons/
-share/icons/hicolor/
-share/icons/hicolor/48x48/
-share/icons/hicolor/48x48/apps/
 share/icons/hicolor/48x48/apps/merkaartor.png
 share/merkaartor/
 share/merkaartor/BookmarksList.xml