diff --git a/sysutils/kkbswitch/Makefile b/sysutils/kkbswitch/Makefile
index 67c639aa1495..6d165a7f1ce0 100644
--- a/sysutils/kkbswitch/Makefile
+++ b/sysutils/kkbswitch/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=		kkbswitch
-PORTVERSION=		1.3.1
-PORTREVISION=	2
+PORTVERSION=		1.4
 CATEGORIES=		sysutils kde
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	kkbswitch
@@ -25,7 +24,22 @@ CONFIGURE_ARGS += 	--with-qt-dir=${QT_PREFIX} \
 
 CONFIGURE_TARGET=
 
-PLIST_SUB=		PREFIX=${PREFIX} \
-			X11BASE=${X11BASE}
+DOCSDIR=		share/doc/HTML/en/${PORTNAME}
 
-.include <bsd.port.mk>
+OPTIONS=		RU_UA_LAYOUT	"With additional RU_UA keyboard layout" on
+
+PLIST_SUB=		PREFIX=${PREFIX} \
+			X11BASE=${X11BASE} \
+			DOCSDIR=${DOCSDIR}
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_RU_UA_LAYOUT)
+PLIST_SUB+=		LAYOUT=""
+.else
+CONFIGURE_ARGS+=	--disable-ru-ua-layout
+PLIST_SUB+=		LAYOUT="@comment "
+.endif
+
+.include "${PORTSDIR}/x11/kde3/Makefile.kde"
+.include <bsd.port.post.mk>
diff --git a/sysutils/kkbswitch/distinfo b/sysutils/kkbswitch/distinfo
index dc99f2580066..35f3f2c81efc 100644
--- a/sysutils/kkbswitch/distinfo
+++ b/sysutils/kkbswitch/distinfo
@@ -1,2 +1,2 @@
-MD5 (kkbswitch-1.3.1.tar.gz) = 38dbe77edb599600a6796ccc0d7fd1e0
-SIZE (kkbswitch-1.3.1.tar.gz) = 566701
+MD5 (kkbswitch-1.4.tar.gz) = ff28207eadc3ff0653da18487588c558
+SIZE (kkbswitch-1.4.tar.gz) = 672499
diff --git a/sysutils/kkbswitch/files/patch-aa b/sysutils/kkbswitch/files/patch-aa
new file mode 100644
index 000000000000..bc5c318a0299
--- /dev/null
+++ b/sysutils/kkbswitch/files/patch-aa
@@ -0,0 +1,8 @@
+--- kkbswitch.upd/kkbswitch_update_14_icons.old	Tue May 18 13:40:41 2004
++++ kkbswitch.upd/kkbswitch_update_14_icons	Thu May 20 15:43:17 2004
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+
+ # update Icons section
+ if [ -z "$DISPLAY" ]; then
diff --git a/sysutils/kkbswitch/pkg-plist b/sysutils/kkbswitch/pkg-plist
index 310f78944636..6e75a76b76f2 100644
--- a/sysutils/kkbswitch/pkg-plist
+++ b/sysutils/kkbswitch/pkg-plist
@@ -1,18 +1,23 @@
 bin/kkbswitch
 share/applnk/Utilities/kkbswitch.desktop
-share/icons/locolor/16x16/apps/kkbswitch.png
-share/icons/locolor/32x32/apps/kkbswitch.png
+share/autostart/kkbswitch.desktop
 share/apps/kkbswitch/group_names
+share/apps/kconf_update/kkbswitch.upd
+share/apps/kconf_update/kkbswitch_update_14_icons
+share/apps/kconf_update/kkbswitch_update_14_options
 share/locale/ru/LC_MESSAGES/kkbswitch.mo
-share/doc/HTML/en/kkbswitch/code_style.png
-share/doc/HTML/en/kkbswitch/flag_code_style.png
-share/doc/HTML/en/kkbswitch/flag_style.png
-share/doc/HTML/en/kkbswitch/index.docbook
-share/doc/HTML/en/kkbswitch/index.cache.bz2
+share/locale/uk/LC_MESSAGES/kkbswitch.mo
+share/locale/el/LC_MESSAGES/kkbswitch.mo
+%%DOCSDIR%%/code_style.png
+%%DOCSDIR%%/flag_code_style.png
+%%DOCSDIR%%/flag_style.png
+%%DOCSDIR%%/index.docbook
+%%DOCSDIR%%/index.cache.bz2
 @cwd %%X11BASE%%
-lib/X11/xkb/symbols/ru_ua
+%%LAYOUT%%lib/X11/xkb/symbols/ru_ua
 @cwd %%PREFIX%%
 @dirrm share/apps/kkbswitch
-@dirrm share/doc/HTML/en/kkbswitch
+@dirrm %%DOCSDIR%%/common
+@dirrm %%DOCSDIR%%
 @unexec rmdir %D/share/applnk/Utilities 2>/dev/null || true
 @unexec rmdir %D/share/applnk 2>/dev/null || true