diff --git a/configure.ac b/configure.ac
index e6ab3cb..480f99e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -46,13 +46,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`])
-AC_SUBST(moduledir)
 
+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)
diff --git a/src/Makefile.am b/src/Makefile.am
index 8bf3491..4f649c2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -30,7 +30,7 @@ AM_CFLAGS = $(BASE_CFLAGS) $(XORG_CFLAGS) $(PCIACCESS_CFLAGS)
 dummy_drv_la_LTLIBRARIES = dummy_drv.la
 dummy_drv_la_LDFLAGS = -module -avoid-version
 dummy_drv_la_LIBADD = $(XORG_LIBS)
-dummy_drv_ladir = @moduledir@/drivers
+dummy_drv_ladir = @xlibre_video_drivers_dir@
 
 dummy_drv_la_SOURCES = \
          dummy_cursor.c \