diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index 560e2ea4e..21daf1a0f 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -710,7 +710,6 @@ typedef enum {
     FLAG_LOG,
     FLAG_RENDER_COLORMAP_MODE,
     FLAG_RANDR,
-    FLAG_AIGLX,
     FLAG_IGNORE_ABI,
     FLAG_ALLOW_EMPTY_INPUT,
     FLAG_USE_DEFAULT_FONT_PATH,
@@ -763,8 +762,6 @@ static OptionInfoRec FlagOptions[] = {
      {0}, FALSE},
     {FLAG_RANDR, "RandR", OPTV_BOOLEAN,
      {0}, FALSE},
-    {FLAG_AIGLX, "AIGLX", OPTV_BOOLEAN,
-     {0}, FALSE},
     {FLAG_IGNORE_ABI, "IgnoreABI", OPTV_BOOLEAN,
      {0}, FALSE},
     {FLAG_USE_DEFAULT_FONT_PATH, "UseDefaultFontPath", OPTV_BOOLEAN,
@@ -917,8 +914,6 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
     }
 #endif
 
-    xf86Info.aiglx = TRUE;
-    xf86Info.aiglxFrom = X_DEFAULT;
 #ifdef GLXEXT
     xf86Info.glxVisuals = XF86_GlxVisualsTypical;
     xf86Info.glxVisualsFrom = X_DEFAULT;
@@ -937,10 +932,6 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
         }
     }
 
-    if (xf86GetOptValBool(FlagOptions, FLAG_AIGLX, &value)) {
-        xf86Info.aiglx = value;
-        xf86Info.aiglxFrom = X_CONFIG;
-    }
     if (xf86Info.iglxFrom != X_CMDLINE) {
         if (xf86GetOptValBool(FlagOptions, FLAG_IGLX, &value)) {
             enableIndirectGLX = value;
diff --git a/hw/xfree86/common/xf86Privstr.h b/hw/xfree86/common/xf86Privstr.h
index 9e327b962..c29b3ccc8 100644
--- a/hw/xfree86/common/xf86Privstr.h
+++ b/hw/xfree86/common/xf86Privstr.h
@@ -86,8 +86,6 @@ typedef struct {
     Bool pmFlag;
     Bool disableRandR;
     MessageType randRFrom;
-    Bool aiglx;
-    MessageType aiglxFrom;
     MessageType iglxFrom;
     XF86_GlxVisuals glxVisuals;
     MessageType glxVisualsFrom;
diff --git a/hw/xfree86/dixmods/glxmodule.c b/hw/xfree86/dixmods/glxmodule.c
index d53c6652d..bf7e65911 100644
--- a/hw/xfree86/dixmods/glxmodule.c
+++ b/hw/xfree86/dixmods/glxmodule.c
@@ -80,13 +80,9 @@ glxSetup(void *module, void *opts, int *errmaj, int *errmin)
 
     setupDone = TRUE;
 
-    xf86Msg(xf86Info.aiglxFrom, "AIGLX %s\n",
-            xf86Info.aiglx ? "enabled" : "disabled");
-    if (xf86Info.aiglx) {
-        provider = LoaderSymbol("__glXDRI2Provider");
-        if (provider)
-            GlxPushProvider(provider);
-    }
+    provider = LoaderSymbol("__glXDRI2Provider");
+    if (provider)
+        GlxPushProvider(provider);
 
     LoadExtensionList(GLXExt, ARRAY_SIZE(GLXExt), FALSE);
 
diff --git a/hw/xfree86/man/xorg.conf.man b/hw/xfree86/man/xorg.conf.man
index 94b199e6b..7d0c52495 100644
--- a/hw/xfree86/man/xorg.conf.man
+++ b/hw/xfree86/man/xorg.conf.man
@@ -632,9 +632,6 @@ Default: PM enabled on platforms that support it.
 enable or disable XINERAMA extension.
 Default is disabled.
 .TP 7
-.BI "Option \*qAIGLX\*q \*q" boolean \*q
-enable or disable AIGLX. AIGLX is enabled by default.
-.TP 7
 .BI "Option \*qIndirectGLX\*q \*q" boolean \*q
 enable or disable indirect GLX contexts. Indirect GLX contexts are disabled by
 default.