diff -Nura /usr/ports/deskutils/xfce4-xkb-plugin/Makefile /home/tiger/vcs/xfce4-xkb-plugin/Makefile
--- /usr/ports/deskutils/xfce4-xkb-plugin/Makefile      2011-04-28 08:54:07.000000000 +0300
+++ /home/tiger/vcs/xfce4-xkb-plugin/Makefile   2011-04-28 14:55:50.000000000 +0300
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=      xfce4-xkb-plugin
-PORTVERSION=   0.5.3.3
+PORTVERSION=   0.5.4.0
 CATEGORIES=    deskutils xfce
-MASTER_SITES=  CRITICAL/.
-DIST_SUBDIR=   xfce4
+MASTER_SITES=   ${MASTER_SITE_XFCE}
+MASTER_SITE_SUBDIR=     src/panel-plugins/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 
 MAINTAINER=    miwi@FreeBSD.org
 COMMENT=       Keyboard layout switching plugin for XFce4
diff -Nura /usr/ports/deskutils/xfce4-xkb-plugin/distinfo /home/tiger/vcs/xfce4-xkb-plugin/distinfo
--- /usr/ports/deskutils/xfce4-xkb-plugin/distinfo      2011-04-18 08:47:52.000000000 +0300
+++ /home/tiger/vcs/xfce4-xkb-plugin/distinfo   2011-04-28 10:39:36.000000000 +0300
@@ -1,2 +1,2 @@
-SHA256 (xfce4/xfce4-xkb-plugin-0.5.3.3.tar.bz2) = 157284a5c7f261fcac47b1d352f0c45b8f480c660d28cba225cb4b0e3b9f7b5f
-SIZE (xfce4/xfce4-xkb-plugin-0.5.3.3.tar.bz2) = 700250
+SHA256 (xfce4-xkb-plugin-0.5.4.0.tar.bz2) = 6f1c508ffcc0409b3c75673772009474d0b7feeb0be9558f6af20c177f34cde7
+SIZE (xfce4-xkb-plugin-0.5.4.0.tar.bz2) = 770012
diff -Nura /usr/ports/deskutils/xfce4-xkb-plugin/pkg-plist /home/tiger/vcs/xfce4-xkb-plugin/pkg-plist
--- /usr/ports/deskutils/xfce4-xkb-plugin/pkg-plist     2011-04-18 08:47:52.000000000 +0300
+++ /home/tiger/vcs/xfce4-xkb-plugin/pkg-plist  2011-04-28 14:35:00.000000000 +0300
@@ -1,5 +1,6 @@
 libexec/xfce4/panel-plugins/xfce4-xkb-plugin
 share/locale/ar/LC_MESSAGES/xfce4-xkb-plugin.mo
+share/locale/ast/LC_MESSAGES/xfce4-xkb-plugin.mo
 share/locale/be/LC_MESSAGES/xfce4-xkb-plugin.mo
 share/locale/bg/LC_MESSAGES/xfce4-xkb-plugin.mo
 share/locale/ca/LC_MESSAGES/xfce4-xkb-plugin.mo
@@ -26,6 +27,7 @@
 share/locale/tr/LC_MESSAGES/xfce4-xkb-plugin.mo
 share/locale/uk/LC_MESSAGES/xfce4-xkb-plugin.mo
 share/locale/ur/LC_MESSAGES/xfce4-xkb-plugin.mo
+share/locale/ur_PK/LC_MESSAGES/xfce4-xkb-plugin.mo
 share/locale/zh_CN/LC_MESSAGES/xfce4-xkb-plugin.mo
 share/locale/zh_TW/LC_MESSAGES/xfce4-xkb-plugin.mo
 share/xfce4/panel-plugins/xkb-plugin.desktop
@@ -94,6 +96,7 @@
 share/xfce4/xkb/flags/pt.svg
 share/xfce4/xkb/flags/qa.svg
 share/xfce4/xkb/flags/ro.svg
+share/xfce4/xkb/flags/rs.svg
 share/xfce4/xkb/flags/ru.svg
 share/xfce4/xkb/flags/sa.svg
 share/xfce4/xkb/flags/sd.svg
@@ -112,7 +115,6 @@
 share/xfce4/xkb/flags/uz.svg
 share/xfce4/xkb/flags/vn.svg
 share/xfce4/xkb/flags/ye.svg
-share/xfce4/xkb/flags/yu.svg
 @dirrmtry libexec/xfce4/panel-plugins
 @dirrmtry libexec/xfce4
 @dirrmtry share/xfce4/panel-plugins