diff --git a/games/klavaro/Makefile b/games/klavaro/Makefile
index 4285328944d1..1236c5467385 100644
--- a/games/klavaro/Makefile
+++ b/games/klavaro/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	klavaro
-PORTVERSION=	1.9.6
-PORTREVISION=	1
+PORTVERSION=	1.9.9
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/
 
@@ -12,19 +11,18 @@ COMMENT=	Touchtyping trainer
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
-		pcre:${PORTSDIR}/devel/pcre \
-		curl:${PORTSDIR}/ftp/curl \
-		cairo:${PORTSDIR}/graphics/cairo \
-		png15:${PORTSDIR}/graphics/png \
-		freetype:${PORTSDIR}/print/freetype2 \
-		expat:${PORTSDIR}/textproc/expat2 \
-		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
-		gtkdatabox:${PORTSDIR}/x11-toolkits/gtkdatabox
+LIB_DEPENDS=	libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs \
+		libpcre.so:${PORTSDIR}/devel/pcre \
+		libcurl.so:${PORTSDIR}/ftp/curl \
+		libcairo.so:${PORTSDIR}/graphics/cairo \
+		libpng15.so:${PORTSDIR}/graphics/png \
+		libfreetype.so:${PORTSDIR}/print/freetype2 \
+		libexpat.so:${PORTSDIR}/textproc/expat2 \
+		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
+		libgtkdatabox.so:${PORTSDIR}/x11-toolkits/gtkdatabox
 
-USES=		pkgconfig gettext iconv
+USES=		pkgconfig gettext gmake iconv pathfix
 USE_BZIP2=	yes
-USE_GMAKE=	yes
 USE_XORG=	pixman x11 xau xcb xcomposite xcursor xdamage xdmcp xext \
 		xfixes xi xinerama xrandr xrender
 USE_GNOME=	gtk20
@@ -32,15 +30,16 @@ USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/gtkdatabox
-LDFLAGS+=	-L${LOCALBASE}/lib
+LDFLAGS+=	-L${LOCALBASE}/lib -rdynamic
 
 GNU_CONFIGURE=	yes
 
-MAN1=		${PORTNAME}.1
-
-NO_STAGE=	yes
 post-extract:
 	@${REINPLACE_CMD} -e 's|/usr|${PREFIX}|' \
 		${WRKSRC}/data/klavaro.desktop.in
 
+pre-build:
+	@${REINPLACE_CMD} -e 's|^am__append_1|#am__append_1|' \
+		${WRKSRC}/src/Makefile
+
 .include <bsd.port.mk>
diff --git a/games/klavaro/distinfo b/games/klavaro/distinfo
index 91f861485a5c..33e093d903f8 100644
--- a/games/klavaro/distinfo
+++ b/games/klavaro/distinfo
@@ -1,2 +1,2 @@
-SHA256 (klavaro-1.9.6.tar.bz2) = 6d7fc916eb83d0381b0719c1525c8ea13a5032abcadd438755c7451b9f071561
-SIZE (klavaro-1.9.6.tar.bz2) = 773462
+SHA256 (klavaro-1.9.9.tar.bz2) = 26bdc403355e6b32221b548c038c64dc07abe154401d9433996fae50485a4ca8
+SIZE (klavaro-1.9.9.tar.bz2) = 859928
diff --git a/games/klavaro/pkg-plist b/games/klavaro/pkg-plist
index 767b525a7276..d5eeb729d7f6 100644
--- a/games/klavaro/pkg-plist
+++ b/games/klavaro/pkg-plist
@@ -8,6 +8,8 @@
 %%DATADIR%%/azerty_fr_ibook.kbd
 %%DATADIR%%/basic_lessons.txt
 %%DATADIR%%/beep.png
+%%DATADIR%%/bg.paragraphs
+%%DATADIR%%/bg.words
 %%DATADIR%%/bn.paragraphs
 %%DATADIR%%/bn.words
 %%DATADIR%%/colemak_us.kbd
@@ -17,6 +19,7 @@
 %%DATADIR%%/da.words
 %%DATADIR%%/de.paragraphs
 %%DATADIR%%/de.words
+%%DATADIR%%/dvorak_bg.kbd
 %%DATADIR%%/dvorak_br_nativo.kbd
 %%DATADIR%%/dvorak_br_us.kbd
 %%DATADIR%%/dvorak_ca_fr.kbd
@@ -32,6 +35,8 @@
 %%DATADIR%%/dvorak_tr_F.kbd
 %%DATADIR%%/dvorak_uk.kbd
 %%DATADIR%%/dvorak_us.kbd
+%%DATADIR%%/el.paragraphs
+%%DATADIR%%/el.words
 %%DATADIR%%/en_GB.paragraphs
 %%DATADIR%%/en_GB.words
 %%DATADIR%%/eo.paragraphs
@@ -81,6 +86,8 @@
 %%DATADIR%%/pt_BR.paragraphs
 %%DATADIR%%/pt_BR.words
 %%DATADIR%%/qwerty_ar.kbd
+%%DATADIR%%/qwerty_bg.kbd
+%%DATADIR%%/qwerty_bg_2.kbd
 %%DATADIR%%/qwerty_br.kbd
 %%DATADIR%%/qwerty_br_abnt2.kbd
 %%DATADIR%%/qwerty_ca_multling.kbd
@@ -90,6 +97,7 @@
 %%DATADIR%%/qwerty_dk.kbd
 %%DATADIR%%/qwerty_es.kbd
 %%DATADIR%%/qwerty_gr.kbd
+%%DATADIR%%/qwerty_gr_old.kbd
 %%DATADIR%%/qwerty_il.kbd
 %%DATADIR%%/qwerty_il_old.kbd
 %%DATADIR%%/qwerty_it.kbd
@@ -123,6 +131,7 @@
 %%DATADIR%%/vi.words
 %%DATADIR%%/workman_us.kbd
 bin/klavaro
+man/man1/klavaro.1.gz
 share/applications/klavaro.desktop
 share/icons/hicolor/16x16/apps/klavaro.png
 share/icons/hicolor/22x22/apps/klavaro.png
@@ -130,10 +139,12 @@ share/icons/hicolor/24x24/apps/klavaro.png
 share/icons/hicolor/32x32/apps/klavaro.png
 share/icons/hicolor/48x48/apps/klavaro.png
 share/locale/ar/LC_MESSAGES/klavaro.mo
+share/locale/bg/LC_MESSAGES/klavaro.mo
 share/locale/bn/LC_MESSAGES/klavaro.mo
 share/locale/cs/LC_MESSAGES/klavaro.mo
 share/locale/da/LC_MESSAGES/klavaro.mo
 share/locale/de/LC_MESSAGES/klavaro.mo
+share/locale/el/LC_MESSAGES/klavaro.mo
 share/locale/en_GB/LC_MESSAGES/klavaro.mo
 share/locale/eo/LC_MESSAGES/klavaro.mo
 share/locale/es/LC_MESSAGES/klavaro.mo
@@ -158,10 +169,14 @@ share/locale/wo/LC_MESSAGES/klavaro.mo
 share/locale/zh_CN/LC_MESSAGES/klavaro.mo
 @dirrmtry share/locale/wo/LC_MESSAGES
 @dirrmtry share/locale/wo
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
 @dirrmtry share/locale/ur/LC_MESSAGES
 @dirrmtry share/locale/ur
 @dirrmtry share/locale/ky/LC_MESSAGES
 @dirrmtry share/locale/ky
+@dirrmtry share/locale/kk/LC_MESSAGES
+@dirrmtry share/locale/kk
 @dirrmtry share/icons/hicolor/48x48/apps
 @dirrmtry share/icons/hicolor/48x48
 @dirrmtry share/icons/hicolor/32x32/apps