diff --git a/x11/libxklavier/Makefile b/x11/libxklavier/Makefile
index 8e7f0aa17be2..4f8f04719141 100644
--- a/x11/libxklavier/Makefile
+++ b/x11/libxklavier/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	libxklavier
-PORTVERSION=	2.1
-PORTREVISION=	1
+PORTVERSION=	2.2
 PORTEPOCH=	1
 CATEGORIES=	x11
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	gswitchit
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.2
+DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	An utility library to make XKB stuff easier
@@ -24,7 +24,8 @@ USE_GETOPT_LONG=yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include -I${X11BASE}/include
 CONFIGURE_ARGS=	--disable-doxygen \
-		--with-xkb-base=${X11BASE}/lib/X11/xkb
+		--with-xkb-base=${X11BASE}/lib/X11/xkb \
+		--with-xmodmap-base=${X11BASE}/share/gnome/xmodmap
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 
diff --git a/x11/libxklavier/distinfo b/x11/libxklavier/distinfo
index bd5bd603eac0..22a33aafe04d 100644
--- a/x11/libxklavier/distinfo
+++ b/x11/libxklavier/distinfo
@@ -1,3 +1,3 @@
-MD5 (libxklavier-2.1.tar.gz) = 6a44ea49f958d7c9ad319edeea338798
-SHA256 (libxklavier-2.1.tar.gz) = 3bc7baa83b02ff86b632778d766f40d5c0075e61cfd708f3d8c808e4ab9971e6
-SIZE (libxklavier-2.1.tar.gz) = 452356
+MD5 (gnome2/libxklavier-2.2.tar.gz) = a9c2e53ea96ed138b588df5a9b9addaf
+SHA256 (gnome2/libxklavier-2.2.tar.gz) = ccfa44ca1128018939906ef32b3a0e85a08efacbc00a32d49628fee7026cc2de
+SIZE (gnome2/libxklavier-2.2.tar.gz) = 467577