diff --git a/libxkbcommon.spec b/libxkbcommon.spec
index 28ead39..6dd3139 100644
--- a/libxkbcommon.spec
+++ b/libxkbcommon.spec
@@ -2,7 +2,7 @@
 
 Name:           libxkbcommon
 Version:        0.5.0
-Release:        2%{?gitdate:.%{gitdate}}%{?dist}
+Release:        3%{?gitdate:.%{gitdate}}%{?dist}
 Summary:        X.Org X11 XKB parsing library
 License:        MIT
 URL:            http://www.x.org
@@ -18,10 +18,7 @@ BuildRequires:  autoconf automake libtool
 BuildRequires:  xorg-x11-util-macros byacc flex bison
 BuildRequires:  xorg-x11-proto-devel libX11-devel
 BuildRequires:  xkeyboard-config-devel
-%if 0%{?fedora} > 20
-%global x11 1
 BuildRequires:  pkgconfig(xcb-xkb) >= 1.10
-%endif
 
 Requires:       xkeyboard-config
 
@@ -87,7 +84,6 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -fv {} ';'
 %{_includedir}/xkbcommon/xkbcommon-names.h
 %{_libdir}/pkgconfig/xkbcommon.pc
 
-%if 0%{?x11}
 %post x11 -p /sbin/ldconfig
 %postun x11 -p /sbin/ldconfig
 
@@ -99,9 +95,11 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -fv {} ';'
 %{_libdir}/libxkbcommon-x11.so
 %{_includedir}/xkbcommon/xkbcommon-x11.h
 %{_libdir}/pkgconfig/xkbcommon-x11.pc
-%endif
 
 %changelog
+* Fri Jan 08 2016 Dan Horák <dan[at]danny.cz> - 0.5.0-3
+- always build the x11 subpackage
+
 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.5.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild