diff --git a/configure.ac b/configure.ac
index 322b107..711ae50 100644
--- a/configure.ac
+++ b/configure.ac
@@ -55,9 +55,8 @@ PKG_CHECK_MODULES(MTDEV, mtdev)
 
 # Define a configure option for an alternate input module directory
 PKG_PROG_PKG_CONFIG([0.25])
-moduledir=`$PKG_CONFIG --variable=moduledir xorg-server`
-inputdir=${moduledir}/input
-AC_SUBST(inputdir)
+xlibre_input_drivers_dir=`$PKG_CONFIG --variable=input_drivers_dir xlibre-server`
+AC_SUBST(xlibre_input_drivers_dir)
 
 xorgconfdir=`$PKG_CONFIG --variable=sysconfigdir xorg-server`
 AC_SUBST(xorgconfdir)
diff --git a/src/Makefile.am b/src/Makefile.am
index 61b8ed0..26348a3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -31,7 +31,7 @@ AM_CPPFLAGS =-I$(top_srcdir)/include $(LIBEVDEV_CFLAGS)
 evdev_drv_la_LTLIBRARIES = evdev_drv.la
 evdev_drv_la_LDFLAGS = -module -avoid-version
 evdev_drv_la_LIBADD = $(MTDEV_LIBS) $(UDEV_LIBS) $(LIBEVDEV_LIBS)
-evdev_drv_ladir = @inputdir@
+evdev_drv_ladir = @xlibre_input_drivers_dir@
 
 evdev_drv_la_SOURCES = evdev.c \
                                evdev.h \