diff --git a/configure.ac b/configure.ac
index 5cf0f3f..a9caa88 100644
--- a/configure.ac
+++ b/configure.ac
@@ -48,11 +48,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)
@@ -88,7 +86,5 @@ esac
 
 AM_CONDITIONAL(BUILD_UTILS, [test "$build_utils" = "yes"])
 
-AC_SUBST([moduledir])
-
 AC_CONFIG_FILES([Makefile src/Makefile man/Makefile util/Makefile])
 AC_OUTPUT
diff --git a/src/Makefile.am b/src/Makefile.am
index 72f0d23..1cb547d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -35,7 +35,7 @@ libct_accelhi_la_CFLAGS = @XORG_CFLAGS@ -DCHIPS_MMIO -DCHIPS_HIQV
 AM_CFLAGS = $(BASE_CFLAGS) $(XORG_CFLAGS)
 chips_drv_la_LTLIBRARIES = chips_drv.la
 chips_drv_la_LDFLAGS = -module -avoid-version
-chips_drv_ladir = @moduledir@/drivers
+chips_drv_ladir = @xlibre_video_drivers_dir@
 chips_drv_la_LIBADD = $(noinst_LTLIBRARIES)
 
 chips_drv_la_SOURCES = \