diff --git a/configure.ac b/configure.ac
index 08bf53f..9f307e9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -47,11 +47,9 @@ AH_TOP([#include "xorg-server.h"])
 
 # Define a configure option for an alternate module directory
 PKG_PROG_PKG_CONFIG([0.25])
-AC_ARG_WITH(xorg-module-dir,
-            AS_HELP_STRING([--with-xorg-module-dir=DIR],
-                           [Default xorg module directory]),
-            [moduledir="$withval"],
-            [moduledir=`$PKG_CONFIG --variable=moduledir xorg-server`])
+
+xlibre_video_drivers_dir=`$PKG_CONFIG --variable=video_drivers_dir xlibre-server`
+AC_SUBST(xlibre_video_drivers_dir)
 
 # Store the list of server defined optional extensions in REQUIRED_MODULES
 XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
@@ -64,7 +62,5 @@ PKG_CHECK_MODULES(XORG, [xorg-server >= 25.0.0 xproto fontsproto $REQUIRED_MODUL
 PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0])
 XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS"
 
-AC_SUBST([moduledir])
-
 AC_CONFIG_FILES([Makefile src/Makefile man/Makefile])
 AC_OUTPUT
diff --git a/src/Makefile.am b/src/Makefile.am
index ad444f8..5d8be78 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -27,7 +27,7 @@ AM_CFLAGS = @XORG_CFLAGS@ $(CWARNFLAGS)
 
 cirrus_drv_la_LTLIBRARIES = cirrus_drv.la
 cirrus_drv_la_LDFLAGS = -module -avoid-version
-cirrus_drv_ladir = @moduledir@/drivers
+cirrus_drv_ladir = @xlibre_video_drivers_dir@
 cirrus_drv_la_SOURCES = \
          cir_dga.c \
          cir_driver.c \