diff --git a/Xext/Makefile.am b/Xext/Makefile.am
index 4082de78d..4f91254a4 100644
--- a/Xext/Makefile.am
+++ b/Xext/Makefile.am
@@ -58,7 +58,7 @@ endif
 # MIT ScreenSaver extension
 SCREENSAVER_SRCS = saver.c
 if SCREENSAVER
-MODULE_SRCS  += $(SCREENSAVER_SRCS)
+BUILTIN_SRCS  += $(SCREENSAVER_SRCS)
 endif
 
 # Xinerama extension: making multiple video devices act as one virtual screen
diff --git a/hw/xfree86/dixmods/extmod/modinit.c b/hw/xfree86/dixmods/extmod/modinit.c
index 009852c33..660b1cda3 100644
--- a/hw/xfree86/dixmods/extmod/modinit.c
+++ b/hw/xfree86/dixmods/extmod/modinit.c
@@ -47,14 +47,6 @@ static ExtensionModule extensionModules[] = {
      NULL,
      NULL},
 #endif
-#ifdef SCREENSAVER
-    {
-     ScreenSaverExtensionInit,
-     ScreenSaverName,
-     &noScreenSaverExtension,
-     NULL,
-     NULL},
-#endif
 #ifdef XF86VIDMODE
     {
      XFree86VidModeExtensionInit,
diff --git a/include/extinit.h b/include/extinit.h
index 2755e30e3..61768b08a 100644
--- a/include/extinit.h
+++ b/include/extinit.h
@@ -110,7 +110,7 @@ extern Bool noResExtension;
 extern void ResExtensionInit(void);
 #endif
 
-#if defined(SCREENSAVER) && !defined(XorgLoader)
+#if defined(SCREENSAVER)
 #include <X11/extensions/saver.h>
 extern Bool noScreenSaverExtension;
 extern void ScreenSaverExtensionInit(void);
diff --git a/mi/miinitext.c b/mi/miinitext.c
index 9c93fc57a..0b4a4cf0f 100644
--- a/mi/miinitext.c
+++ b/mi/miinitext.c
@@ -397,6 +397,9 @@ static ExtensionModule staticExtensions[] = {
 #ifdef DAMAGE
     {DamageExtensionInit, "DAMAGE", &noDamageExtension, NULL},
 #endif
+#ifdef SCREENSAVER
+    {ScreenSaverExtensionInit, ScreenSaverName, &noScreenSaverExtension, NULL},
+#endif
 #ifdef DBE
     {DbeExtensionInit, "DOUBLE-BUFFER", &noDbeExtension, NULL},
 #endif