diff --git a/libxkbcommon.changes b/libxkbcommon.changes
index 06f392b..6df8acc 100644
--- a/libxkbcommon.changes
+++ b/libxkbcommon.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Oct 19 01:30:35 UTC 2017 - jayvdb@gmail.com
+
+- Allow building x11 subpackage on any distribution
+
 -------------------------------------------------------------------
 Mon Aug  7 16:29:12 UTC 2017 - jengelh@inai.de
 
diff --git a/libxkbcommon.spec b/libxkbcommon.spec
index 3819466..e855191 100644
--- a/libxkbcommon.spec
+++ b/libxkbcommon.spec
@@ -16,6 +16,12 @@
 #
 
 
+%if ! 0%{?suse_version} || 0%{?suse_version} >= 1315
+%bcond_without x11
+%else
+%bcond_with    x11
+%endif
+
 Name:           libxkbcommon
 Version:        0.7.2
 Release:        0
@@ -38,7 +44,7 @@ BuildRequires:  xz
 BuildRequires:  pkgconfig(xkeyboard-config)
 BuildRequires:  pkgconfig(xorg-macros) >= 1.8
 BuildRequires:  pkgconfig(xproto)
-%if 0%{?suse_version} >= 1315
+%if %{with x11}
 BuildRequires:  pkgconfig(xcb-xkb) >= 1.10
 %endif
 
@@ -108,20 +114,20 @@ in %name-x11-0.
 
 %build
 if [ ! -e configure ]; then
-	NOCONFIGURE=1 ./autogen.sh;
-fi;
-%if 0%{?suse_version} >= 1315
+	NOCONFIGURE=1 ./autogen.sh
+fi
+%if %{with x11}
 extra_opts=--enable-x11
 %else
 extra_opts=--disable-x11
 %endif
 # Ensure people will use pkgconfig to locate headers.
-%configure --disable-static --includedir="%_includedir/pkg/%name" $extra_opts
+%configure --disable-static --includedir="%_includedir/%name" $extra_opts
 make %{?_smp_mflags} V=1
 
 %install
-make install DESTDIR="%buildroot";
-rm -f "%buildroot/%_libdir"/*.la;
+%make_install
+rm -f "%buildroot/%_libdir"/*.la
 
 %post   -n libxkbcommon0 -p /sbin/ldconfig
 %postun -n libxkbcommon0 -p /sbin/ldconfig
@@ -136,28 +142,25 @@ rm -f "%buildroot/%_libdir"/*.la;
 %files devel
 %defattr(-,root,root)
 %doc LICENSE NEWS
-%_includedir/pkg/
-%if 0%{?suse_version} >= 1315
-%exclude %_includedir/pkg/%name/xkbcommon/xkbcommon-x11.h
+%_includedir/%name/
+%if %{with x11}
+%exclude %_includedir/%name/xkbcommon/xkbcommon-x11.h
 %endif
 %_libdir/libxkbcommon.so
 %_libdir/pkgconfig/xkbcommon.pc
 
-%if 0%{?suse_version} >= 1315
+%if %{with x11}
 %files -n libxkbcommon-x11-0
 %defattr(-,root,root)
 %doc LICENSE NEWS
 %_libdir/libxkbcommon-x11.so.*
-%endif
 
-%if 0%{?suse_version} >= 1315
 %files x11-devel
 %defattr(-,root,root)
 %doc LICENSE NEWS
-%dir %_includedir/pkg
-%dir %_includedir/pkg/%name
-%dir %_includedir/pkg/%name/xkbcommon
-%_includedir/pkg/%name/xkbcommon/xkbcommon-x11.h
+%dir %_includedir/%name
+%dir %_includedir/%name/xkbcommon
+%_includedir/%name/xkbcommon/xkbcommon-x11.h
 %_libdir/libxkbcommon-x11.so
 %_libdir/pkgconfig/xkbcommon-x11.pc
 %endif