diff --git a/core/etc/grs/world.conf b/core/etc/grs/world.conf
index 9f05221..488fc80 100644
--- a/core/etc/grs/world.conf
+++ b/core/etc/grs/world.conf
@@ -626,13 +626,13 @@ package.use : dev-qt/qtcore:4 -aqua -debug -libressl -pch exceptions glib iconv
 package.use : dev-qt/qtgui:4 -aqua -debug -egl -gtkstyle -nis -pch -trace accessibility cups exceptions glib mng nas qt3support tiff xinerama xv
 
 [dev-qt/qtlockedfile:0]
-package.use : dev-qt/qtlockedfile:0 -doc -qt5 qt4
+package.use : dev-qt/qtlockedfile:0 -doc qt4 qt5
 
 [dev-qt/qtscript:4]
 package.use : dev-qt/qtscript:4 -aqua -debug -jit -pch exceptions
 
 [dev-qt/qtsingleapplication:0]
-package.use : dev-qt/qtsingleapplication:0 -doc -qt5 X qt4
+package.use : dev-qt/qtsingleapplication:0 -doc X qt4 qt5
 
 [dev-qt/qtsql:4]
 package.use : dev-qt/qtsql:4 -aqua -debug -freetds -mysql -oci8 -pch -postgres exceptions odbc qt3support sqlite
@@ -1679,6 +1679,9 @@ package.use : x11-libs/libwnck:3 -tools introspection startup-notification
 [x11-libs/libxcb:0]
 package.use : x11-libs/libxcb:0 -doc -selinux -test static-libs xkb
 
+[x11-libs/libxkbcommon:0]
+package.use : x11-libs/libxkbcommon:0 -doc -static-libs -test X
+
 [x11-libs/libxkbfile:0]
 package.use : x11-libs/libxkbfile:0 static-libs