diff --git a/ChangeLog b/ChangeLog
index 4e8f7a72a..9012012cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-30  Carl Worth  <cworth@isi.edu>
+
+	* src/Makefile.am (libcairo_la_LIBADD): Add -lz.
+
 2004-03-30  Carl Worth  <cworth@isi.edu>
 
 	* configure.in: Add checks for Xrender.h in xrender.pc is not
diff --git a/src/Makefile.am b/src/Makefile.am
index d77287207..4278a1bbc 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -55,4 +55,5 @@ libcairo_la_LDFLAGS = -version-info @VERSION_INFO@ -no-undefined
 
 INCLUDES = -I$(srcdir) $(CAIRO_CFLAGS) $(FONTCONFIG_CFLAGS) $(XRENDER_CFLAGS) $(XCB_CFLAGS) $(PNG_CFLAGS)
 
-libcairo_la_LIBADD = $(CAIRO_LIBS) $(FONTCONFIG_LIBS) $(XRENDER_LIBS) $(XCB_LIBS) $(PNG_LIBS) -lm
+libcairo_la_LIBADD = $(CAIRO_LIBS) $(FONTCONFIG_LIBS) $(XRENDER_LIBS) $(XCB_LIBS) $(PNG_LIBS) -lm -lz
+
diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c
index 913ed8369..3975938ab 100644
--- a/src/cairo-ft-font.c
+++ b/src/cairo-ft-font.c
@@ -496,7 +496,7 @@ _cairo_ft_font_show_glyphs (void		*abstract_font,
 	unsigned char *bitmap;
 
         FT_Load_Glyph (ft->face, glyphs[i].index, FT_LOAD_DEFAULT);
-        FT_Render_Glyph (glyphslot, FT_RENDER_MODE_NORMAL);
+        FT_Render_Glyph (glyphslot, ft_render_mode_normal);
       
         width = glyphslot->bitmap.width;
         height = glyphslot->bitmap.rows;
diff --git a/src/cairo_ft_font.c b/src/cairo_ft_font.c
index 913ed8369..3975938ab 100644
--- a/src/cairo_ft_font.c
+++ b/src/cairo_ft_font.c
@@ -496,7 +496,7 @@ _cairo_ft_font_show_glyphs (void		*abstract_font,
 	unsigned char *bitmap;
 
         FT_Load_Glyph (ft->face, glyphs[i].index, FT_LOAD_DEFAULT);
-        FT_Render_Glyph (glyphslot, FT_RENDER_MODE_NORMAL);
+        FT_Render_Glyph (glyphslot, ft_render_mode_normal);
       
         width = glyphslot->bitmap.width;
         height = glyphslot->bitmap.rows;