diff --git a/ChangeLog b/ChangeLog
index 90323650e..d68277465 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-05-03  Adam Jackson  <ajax@freedesktop.org>
+
+	* hw/xfree86/common/xf86Configure.c:
+	* hw/xfree86/utils/xorgcfg/text-mode.c:
+	* hw/xfree86/utils/xorgconfig/xorgconfig.c:
+	Redact a few mentions of speedo font support.
+
 2006-05-02  Matthieu Herrb  <matthieu.herrb@laas.fr>
 
 	* render/mitri.c:
diff --git a/hw/xfree86/common/xf86Configure.c b/hw/xfree86/common/xf86Configure.c
index 3159704ac..fac9fc0b9 100644
--- a/hw/xfree86/common/xf86Configure.c
+++ b/hw/xfree86/common/xf86Configure.c
@@ -649,9 +649,7 @@ configureModuleSection (void)
 		(strcmp(*el, "freetype")  == 0 &&
 		 strstr(defaultFontPath, "/TTF")) ||
     	        (strcmp(*el, "type1")  == 0 &&
-		 strstr(defaultFontPath, "/Type1")) ||
-    	        (strcmp(*el, "speedo") == 0 &&
-		 strstr(defaultFontPath, "/Speedo"))))
+		 strstr(defaultFontPath, "/Type1")))) 
 	    	ptr->mod_load_lst = (XF86LoadPtr)xf86addListItem(
 					(glp)ptr->mod_load_lst, (glp)module);
     	}
diff --git a/hw/xfree86/utils/xorgcfg/text-mode.c b/hw/xfree86/utils/xorgcfg/text-mode.c
index bb61eae1e..317e30ae1 100644
--- a/hw/xfree86/utils/xorgcfg/text-mode.c
+++ b/hw/xfree86/utils/xorgcfg/text-mode.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xserver/xorg/hw/xfree86/utils/xorgcfg/text-mode.c,v 1.6 2005/12/08 17:54:40 kem Exp $ */
+/* $XdotOrg: xserver/xorg/hw/xfree86/utils/xorgcfg/text-mode.c,v 1.7 2006/04/18 17:28:44 spyderous Exp $ */
 /*
  * Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com)
  * 
@@ -321,7 +321,7 @@ WriteXF86Config(void)
     if (newconfig) {
 	if (XF86Config->conf_modules == NULL) {
 	    static char *modules[] = {"extmod", "glx", "dri", "dbe",
-				      "record", "xtrap", "type1", "speedo"};
+				      "record", "xtrap", "type1"};
 	    XF86LoadPtr load;
 	    int i;
 
diff --git a/hw/xfree86/utils/xorgconfig/xorgconfig.c b/hw/xfree86/utils/xorgconfig/xorgconfig.c
index 4570e081a..ab3c1d03c 100644
--- a/hw/xfree86/utils/xorgconfig/xorgconfig.c
+++ b/hw/xfree86/utils/xorgconfig/xorgconfig.c
@@ -87,14 +87,13 @@
  *  - Fix seg.fault problem on Solaris.
  *  - Add modestring "1400x1050"(for ATI Mobile-Rage).
  *  - Add videomemory 8192, 16384, 32768, 65536, 131072 and 262144.
- *  - Load "speedo" module.
  *  - Ready to DRI.
  *  - Load xtt module instead of freetype module.
  *  - Add font path "/TrueType/" and "/freefont/".
  *  Chisato Yamauchi(cyamauch@phyas.aichi-edu.ac.jp)
  */
 /* $XConsortium: xf86config.c /main/21 1996/10/28 05:43:57 kaleb $ */
-/* $XdotOrg: xserver/xorg/hw/xfree86/utils/xorgconfig/xorgconfig.c,v 1.19 2005/11/08 06:33:30 jkj Exp $ */
+/* $XdotOrg: xserver/xorg/hw/xfree86/utils/xorgconfig/xorgconfig.c,v 1.20 2006/04/18 17:28:44 spyderous Exp $ */
 
 #ifdef HAVE_CONFIG_H
 # include "xorg-server.h"
@@ -1948,11 +1947,6 @@ static char *XF86Config_firstchunk_text =
 #else
 "#    Load        \"type1\"\n"
 #endif
-#ifdef HAS_SPEEDO
-"    Load        \"speedo\"\n"
-#else
-"#    Load        \"speedo\"\n"
-#endif
 "    Load        \"freetype\"\n"
 "#    Load        \"xtt\"\n"
 "\n"
@@ -1981,8 +1975,8 @@ static char *XF86Config_firstchunk_text =
 "# \n"
 #if 0
 "# If you don't have a floating point coprocessor and emacs, Mosaic or other\n"
-"# programs take long to start up, try moving the Type1 and Speedo directory\n"
-"# to the end of this list (or comment them out).\n"
+"# programs take long to start up, try moving the Type1 directory\n"
+"# to the end of this list (or comment it out).\n"
 #endif
 "# \n"
 "\n";