diff --git a/libxklavier.changes b/libxklavier.changes
index c987367..f3d185d 100644
--- a/libxklavier.changes
+++ b/libxklavier.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Feb  1 15:19:46 UTC 2016 - dimstar@opensuse.org
+
+- Pass --with-xkb-bin-base=%{_bindir} to configure: we know that
+  xkbcomp is installed there (boo#964360).
+- Add xkbcomp Requires to libxklavier16: the xkbcomp binary is
+  required for proper functioning of the library.
+
 -------------------------------------------------------------------
 Sat Oct 18 21:20:49 UTC 2014 - crrodriguez@opensuse.org
 
diff --git a/libxklavier.spec b/libxklavier.spec
index f9088c7..92bc55b 100644
--- a/libxklavier.spec
+++ b/libxklavier.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package libxklavier
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -35,6 +35,7 @@ BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(xi)
 BuildRequires:  pkgconfig(xkbfile)
+Requires:       xkbcomp
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -83,9 +84,11 @@ This library allows you to simplify XKB-related development.
 %setup -q
 
 %build
-%configure --with-pic\
-	--with-xkb-base=/usr/share/X11/xkb\
-	--disable-static
+%configure \
+        --with-pic \
+        --with-xkb-base=/usr/share/X11/xkb \
+        --with-xkb-bin-base=%{_bindir} \
+        --disable-static
 make %{?_smp_mflags}
 
 %install