diff --git a/ChangeLog b/ChangeLog
index dfda4905b..21623b728 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-12-28 Tomas Cech
+
+        * Fix construction of variant list for setxkbmap
+
 2012-12-27 Mike Blumenkrantz
 
         * Added action to reset filemanager
diff --git a/NEWS b/NEWS
index ad009df03..e4c63bcac 100644
--- a/NEWS
+++ b/NEWS
@@ -34,3 +34,4 @@ Fixes:
     * Filemanager now uses global setting option for showing desktop
       icons
     * Fixed error in Evry when trying to call edje functions on non-edje object
+    * Fix construction of variant list for setxkbmap
diff --git a/src/bin/e_xkb.c b/src/bin/e_xkb.c
index c289da1f2..e1984da47 100644
--- a/src/bin/e_xkb.c
+++ b/src/bin/e_xkb.c
@@ -78,9 +78,8 @@ e_xkb_update(int cur_group)
         eina_strbuf_append(buf, "' -variant '");
         EINA_LIST_FOREACH(e_config->xkb.used_layouts, l, cl)
           {
-             if (cl->variant)
+             if ((cl->variant) && (strcmp(cl->variant, "basic")))
                {
-                  if (!strcmp(cl->variant, "basic")) continue;
                   eina_strbuf_append(buf, cl->variant);
                   eina_strbuf_append(buf, ",");
                }