diff --git a/glamor/Makefile.am b/glamor/Makefile.am
index d6105d002..ca8fc3fbf 100644
--- a/glamor/Makefile.am
+++ b/glamor/Makefile.am
@@ -50,13 +50,12 @@ libglamor_la_SOURCES = \
 sdk_HEADERS = glamor.h
 
 if EGL
-LIBGLAMOR_EGL = libglamor_egl.la
-module_LTLIBRARIES = $(LIBGLAMOR_EGL) 
-libglamor_egl_la_DEPENDENCIES = libglamor.la
-libglamor_egl_la_LDFLAGS = -avoid-version -module $(EGL_LIBS) -lglamor
-#libglamor_egl_la_LIBADD = $(top_builddir)/src/libglamor.la
-libglamor_egl_la_SOURCES = glamor_eglmodule.c $(top_srcdir)/src/glamor_egl.c
-libglamor_egl_la_CFLAGS = $(AM_CFLAGS) -I$(top_srcdir)/src $(LIBDRM_CFLAGS) $(EGL_CFLAGS)
+LIBGLAMOREGL = libglamoregl.la
+module_LTLIBRARIES = $(LIBGLAMOREGL)
+libglamoregl_la_DEPENDENCIES = libglamor.la
+libglamoregl_la_LDFLAGS = -avoid-version -module $(EGL_LIBS) -lglamor
+libglamoregl_la_SOURCES = glamor_eglmodule.c $(top_srcdir)/src/glamor_egl.c
+libglamoregl_la_CFLAGS = $(AM_CFLAGS) -I$(top_srcdir)/src $(LIBDRM_CFLAGS) $(EGL_CFLAGS)
 endif
 
 
diff --git a/glamor/glamor.h b/glamor/glamor.h
index e29a3e43f..3d6e5fe7f 100644
--- a/glamor/glamor.h
+++ b/glamor/glamor.h
@@ -146,6 +146,9 @@ extern _X_EXPORT PixmapPtr glamor_create_pixmap(ScreenPtr screen, int w, int h,
 extern _X_EXPORT void glamor_egl_screen_init(ScreenPtr screen);
 
 #ifdef GLAMOR_FOR_XORG
+
+#define GLAMOR_EGL_MODULE_NAME  "glamoregl"
+
 /* @glamor_egl_init: Initialize EGL environment.
  *
  * @scrn: Current screen info pointer.
diff --git a/glamor/glamor_eglmodule.c b/glamor/glamor_eglmodule.c
index 4da57af93..e1f6672af 100644
--- a/glamor/glamor_eglmodule.c
+++ b/glamor/glamor_eglmodule.c
@@ -29,11 +29,12 @@
 #endif
 
 #include <xorg-server.h>
-
+#define GLAMOR_FOR_XORG
+#include "glamor.h"
 #include "xf86Module.h"
 
 static XF86ModuleVersionInfo VersRec = {
-	"glamor_egl",
+	GLAMOR_EGL_MODULE_NAME,
 	MODULEVENDORSTRING,
 	MODINFOSTRING1,
 	MODINFOSTRING2,
@@ -45,4 +46,4 @@ static XF86ModuleVersionInfo VersRec = {
 	{0, 0, 0, 0}		/* signature, to be patched into the file by a tool */
 };
 
-_X_EXPORT XF86ModuleData glamor_eglModuleData = { &VersRec, NULL, NULL };
+_X_EXPORT XF86ModuleData glamoreglModuleData = { &VersRec, NULL, NULL };