diff --git a/ChangeLog b/ChangeLog
index 8ecbebfd9..e12f49b97 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Aug 16 12:09:09 2005  Søren Sandmann  <sandmann@redhat.com>
+
+	* hw/xfree86/dixmods/Makefile.am: Add ft and type1 modules.
+
 Mon Aug 15 15:41:26 2005  Søren Sandmann  <sandmann@redhat.com>
 
 	* hw/xfree86/dixmods/extmod/Makefile.am (libextmod_la_LIBADD):
diff --git a/hw/xfree86/dixmods/Makefile.am b/hw/xfree86/dixmods/Makefile.am
index 7283e2bcc..3b1130020 100644
--- a/hw/xfree86/dixmods/Makefile.am
+++ b/hw/xfree86/dixmods/Makefile.am
@@ -18,6 +18,8 @@ module_LTLIBRARIES = libafb.la \
                      libmfb.la \
                      librecord.la \
                      libshadow.la \
+		     libfreetype.la \
+                     libtype1.la \
                      $(GLXMODS)
 
 AM_CFLAGS = @XORG_CFLAGS@
@@ -88,4 +90,10 @@ libshadow_la_LDFLAGS = -avoid-version
 libshadow_la_LIBADD = $(top_builddir)/miext/shadow/libshadow.la
 libshadow_la_SOURCES = shmodule.c
 
+libfreetype_la_LDFLAGS = -avoid-version
+libfreetype_la_SOURCES = ftmodule.c
+
+libtype1_la_LDFLAGS = -avoid-version
+libtype1_la_SOURCES = type1mod.c
+
 libdixmods_la_SOURCES = $(top_srcdir)/mi/miinitext.c