diff -ruN games/klavaro.bak/Makefile games/klavaro/Makefile
--- games/klavaro.bak/Makefile	2012-09-02 21:14:46.000000000 +0200
+++ games/klavaro/Makefile	2012-09-02 21:15:38.000000000 +0200
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	klavaro
-PORTVERSION=	1.9.3
-PORTREVISION=	2
+PORTVERSION=	1.9.5
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/
 
diff -ruN games/klavaro.bak/distinfo games/klavaro/distinfo
--- games/klavaro.bak/distinfo	2012-09-02 21:14:46.000000000 +0200
+++ games/klavaro/distinfo	2012-09-02 21:16:28.000000000 +0200
@@ -1,2 +1,2 @@
-SHA256 (klavaro-1.9.3.tar.bz2) = 16c821264d247f70beac350953d841b85bd7e093a1c04369ba676c3a8b0b0013
-SIZE (klavaro-1.9.3.tar.bz2) = 750314
+SHA256 (klavaro-1.9.5.tar.bz2) = 06c35247866fb74f7c1a52a2350b352fdb44dace7216fdbebc1fa54990d14fc9
+SIZE (klavaro-1.9.5.tar.bz2) = 757130
diff -ruN games/klavaro.bak/pkg-plist games/klavaro/pkg-plist
--- games/klavaro.bak/pkg-plist	2012-09-02 21:14:46.000000000 +0200
+++ games/klavaro/pkg-plist	2012-09-02 21:42:37.000000000 +0200
@@ -24,6 +24,7 @@
 %%DATADIR%%/dvorak_eo_eurokeys.kbd
 %%DATADIR%%/dvorak_eo_nativo.kbd
 %%DATADIR%%/dvorak_eo_uk.kbd
+%%DATADIR%%/dvorak_es_nativo.kbd
 %%DATADIR%%/dvorak_es_us.kbd
 %%DATADIR%%/dvorak_fr.kbd
 %%DATADIR%%/dvorak_fr_bepo.kbd
@@ -103,6 +104,8 @@
 %%DATADIR%%/qwerty_uk.kbd
 %%DATADIR%%/qwerty_us.kbd
 %%DATADIR%%/qwerty_us_2.kbd
+%%DATADIR%%/qwertz_ch_de.kbd
+%%DATADIR%%/qwertz_ch_fr.kbd
 %%DATADIR%%/qwertz_cz.kbd
 %%DATADIR%%/qwertz_de.kbd
 %%DATADIR%%/qwertz_hu.kbd
@@ -148,6 +151,7 @@
 share/locale/uk/LC_MESSAGES/klavaro.mo
 share/locale/ur/LC_MESSAGES/klavaro.mo
 share/locale/vi/LC_MESSAGES/klavaro.mo
+share/locale/wo/LC_MESSAGES/klavaro.mo
 share/locale/zh_CN/LC_MESSAGES/klavaro.mo
 @dirrmtry share/locale/ur/LC_MESSAGES
 @dirrmtry share/locale/ur