diff --git a/.gitignore b/.gitignore
index 67089be..0f1c81f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/xkeyboard-config-2.14.tar.bz2
+SOURCES/xkeyboard-config-2.20.tar.bz2
diff --git a/.xkeyboard-config.metadata b/.xkeyboard-config.metadata
index 2776727..ac04c9a 100644
--- a/.xkeyboard-config.metadata
+++ b/.xkeyboard-config.metadata
@@ -1 +1 @@
-b37c42b26739bedb9716c60c92f721c1ad934116 SOURCES/xkeyboard-config-2.14.tar.bz2
+fe36dc8259571721776f885ba66060e0b5a0616c SOURCES/xkeyboard-config-2.20.tar.bz2
diff --git a/SOURCES/0001-Revert-rules-Move-Finnish-DAS-layout-to-extras.patch b/SOURCES/0001-Revert-rules-Move-Finnish-DAS-layout-to-extras.patch
new file mode 100644
index 0000000..d6f8063
--- /dev/null
+++ b/SOURCES/0001-Revert-rules-Move-Finnish-DAS-layout-to-extras.patch
@@ -0,0 +1,48 @@
+From af984bd5ac9041090ead4d3461c081d045d8608b Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Mon, 5 Dec 2016 10:33:04 +1000
+Subject: [PATCH] Revert "rules: Move Finnish DAS layout to extras"
+
+This reverts commit d4d906d28b135a30b3761c263f0e9aff5da809d5.
+---
+ rules/base.extras.xml.in | 6 ------
+ rules/base.xml.in        | 6 ++++++
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/rules/base.extras.xml.in b/rules/base.extras.xml.in
+index f95f44d..4fd7d20 100644
+--- a/rules/base.extras.xml.in
++++ b/rules/base.extras.xml.in
+@@ -660,12 +660,6 @@
+       <variantList>
+         <variant>
+           <configItem>
+-            <name>das</name>
+-            <_description>Finnish (DAS)</_description>
+-          </configItem>
+-        </variant>
+-        <variant>
+-          <configItem>
+             <name>sun_type6</name>
+             <_description>Finnish (Sun Type 6/7)</_description>
+           </configItem>
+diff --git a/rules/base.xml.in b/rules/base.xml.in
+index ffa70eb..d1c1393 100644
+--- a/rules/base.xml.in
++++ b/rules/base.xml.in
+@@ -2720,6 +2720,12 @@
+             <_description>Finnish (Macintosh)</_description>
+           </configItem>
+         </variant>
++        <variant>
++          <configItem>
++            <name>das</name>
++            <_description>Finnish (DAS)</_description>
++          </configItem>
++        </variant>
+       </variantList>
+     </layout>
+     <layout>
+-- 
+2.9.3
+
diff --git a/SPECS/xkeyboard-config.spec b/SPECS/xkeyboard-config.spec
index c63dec7..c0cd4c1 100644
--- a/SPECS/xkeyboard-config.spec
+++ b/SPECS/xkeyboard-config.spec
@@ -6,7 +6,7 @@
 
 Summary: X Keyboard Extension configuration data
 Name: xkeyboard-config
-Version: 2.14
+Version: 2.20
 Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
 License: MIT
 Group: User Interface/X
@@ -19,6 +19,8 @@ Source2:    commitid
 Source0: http://xorg.freedesktop.org/archive/individual/data/xkeyboard-config/%{name}-%{version}.tar.bz2
 %endif
 
+Patch01: 0001-Revert-rules-Move-Finnish-DAS-layout-to-extras.patch
+
 BuildArch: noarch
 
 BuildRequires: pkgconfig
@@ -109,6 +111,9 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/X11/xkb/compiled
 %{_datadir}/pkgconfig/xkeyboard-config.pc
 
 %changelog
+* Wed Feb 08 2017 Peter Hutterer <peter.hutterer@redhat.com> 2.20-1
+- xkeyboard-config 2.20 (#1401753)
+
 * Tue Jun 16 2015 Peter Hutterer <peter.hutterer@redhat.com> 2.14-1
 - xkeyboard-config 2.14 (#1194871)