diff --git a/.gitignore b/.gitignore
index 8c05a44..9dc7a99 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,4 @@ xkeyboard-config-1.9.tar.bz2
 /xkeyboard-config-2.21.tar.bz2
 /xkeyboard-config-2.22.tar.bz2
 /xkeyboard-config-2.23.tar.bz2
+/xkeyboard-config-2.23.1.tar.bz2
diff --git a/0001-Fix-typo-in-Polish-symbols-file.patch b/0001-Fix-typo-in-Polish-symbols-file.patch
new file mode 100644
index 0000000..4a75246
--- /dev/null
+++ b/0001-Fix-typo-in-Polish-symbols-file.patch
@@ -0,0 +1,25 @@
+From 9a5cecf64ffc427a6a5a7c9a061992c32e5b8a4f Mon Sep 17 00:00:00 2001
+From: Gunnar Hjalmarsson <gunnarhj@ubuntu.com>
+Date: Thu, 1 Feb 2018 15:37:46 +0100
+Subject: [PATCH xkeyboard-config] Fix typo in Polish symbols file
+
+https://bugs.freedesktop.org/show_bug.cgi?id=104904
+---
+ symbols/pl | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/symbols/pl b/symbols/pl
+index 52e7959..800cb85 100644
+--- a/symbols/pl
++++ b/symbols/pl
+@@ -497,7 +497,6 @@ partial alphanumeric_keys
+        include "sun_vndr/pl(sun_type6)"
+ };
+ 
+-------------------------------
+ //Glagolica
+ partial alphanumeric_keys
+ xkb_symbols "glagolica"
+-- 
+2.14.3
+
diff --git a/sources b/sources
index 4c5aaff..044858f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (xkeyboard-config-2.23.tar.bz2) = 5a455d7bce3c10869c340dc406c4775c62b078f5090d13e2d9df3eb1a860b5877334d3987af4bc8d468932a6cbc200a3e2ec889a12ee004d88f45fd61afffb6e
+SHA512 (xkeyboard-config-2.23.1.tar.bz2) = d651bb89c265e58abe8bba4af6683364a8023cb73af7d00f401f33960e44fa94a7d8a8fdd2483d6703d1c261ca72ae5f2b53f543cfb70b2f571cfe9dcb80c3ba
diff --git a/xkeyboard-config.spec b/xkeyboard-config.spec
index 34be6a3..f00b904 100644
--- a/xkeyboard-config.spec
+++ b/xkeyboard-config.spec
@@ -6,7 +6,7 @@
 
 Summary:    X Keyboard Extension configuration data
 Name:       xkeyboard-config
-Version:    2.23
+Version:    2.23.1
 Release:    1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
 License:    MIT
 URL:        http://www.freedesktop.org/wiki/Software/XKeyboardConfig
@@ -21,6 +21,7 @@ Source0:    http://xorg.freedesktop.org/archive/individual/data/%{name}/%{name}-
 
 # Submitted upstream
 Patch1:     0001-Add-evdev-mappings-for-KEY_SOUND-KEY_UWB-KEY_WWAN-an.patch 
+Patch2:     0001-Fix-typo-in-Polish-symbols-file.patch
 
 BuildArch:  noarch
 
@@ -53,27 +54,7 @@ Requires:   pkgconfig
 Development files for %{name}.
 
 %prep
-%setup -q -n %{name}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}}
-
-%if 0%{?gitdate}
-git checkout -b fedora
-sed -i 's/git/&+ssh/' .git/config
-if [ -z "$GIT_COMMITTER_NAME" ]; then
-    git config user.email "x@fedoraproject.org"
-    git config user.name "Fedora X Ninjas"
-fi
-git commit -am "%{name} %{version}"
-%else
-git init
-if [ -z "$GIT_COMMITTER_NAME" ]; then
-    git config user.email "x@fedoraproject.org"
-    git config user.name "Fedora X Ninjas"
-fi
-git add .
-git commit -a -q -m "%{name} %{version} baseline."
-%endif
-
-git am -p1 %{patches} < /dev/null
+%autosetup -S git
 
 %build
 AUTOPOINT="intltoolize --automake --copy" autoreconf -v --force --install || exit 1
@@ -111,6 +92,11 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/X11/xkb/compiled
 %{_datadir}/pkgconfig/xkeyboard-config.pc
 
 %changelog
+* Wed Feb 07 2018 Peter Hutterer <peter.hutterer@redhat.com> 2.23.1-1
+- Fix typo in polish keyboard layout
+- xkeyboard-config 2.23.1
+- use autosetup
+
 * Wed Jan 31 2018 Peter Hutterer <peter.hutterer@redhat.com> 2.23-1
 - xkeyboard-config 2.23