diff --git a/ChangeLog b/ChangeLog
index 6921afb28..db42447cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-04-03  Werner Lemberg  <wl@gnu.org>
+
+	* builds/exports.mk (clean_symbols_list, clean_apinames): Removed.
+	(CLEAN): Add $(EXPORTS_LIST) and $(APINAMES_EXE).
+	(.PHONY): Updated.
+
+	* configure.ac: Minor fixes to improve --help output.
+
 2006-04-01  David Turner  <david@freetype.org>
 
 	* docs/CHANGES: Updated.
diff --git a/builds/exports.mk b/builds/exports.mk
index 76b28c541..f8bf69ab3 100644
--- a/builds/exports.mk
+++ b/builds/exports.mk
@@ -3,7 +3,7 @@
 #
 
 
-# Copyright 2005 by
+# Copyright 2005, 2006 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -53,7 +53,7 @@ ifneq ($(EXPORTS_LIST),)
   $(APINAMES_EXE): $(APINAMES_SRC)
 	  $(CCexe) $(TE)$@ $<
 
-  .PHONY: symbols_list clean_symbols_list clean_apinames
+  .PHONY: symbols_list
 
   symbols_list: $(EXPORTS_LIST)
 
@@ -67,13 +67,8 @@ ifneq ($(EXPORTS_LIST),)
 
   $(PROJECT_LIBRARY): $(EXPORTS_LIST)
 
-  clean_symbols_list:
-	  -$(DELETE) $(subst /,$(SEP),$(EXPORTS_LIST))
-
-  clean_apinames:
-	  -$(DELETE) $(subst /,$(SEP),$(APINAMES_EXE))
-
-  clean_project: clean_symbols_list clean_apinames
+  CLEAN += $(EXPORTS_LIST) \
+           $(APINAMES_EXE)
 
 endif
 
diff --git a/builds/unix/configure.ac b/builds/unix/configure.ac
index a5836ad60..22ad65fda 100644
--- a/builds/unix/configure.ac
+++ b/builds/unix/configure.ac
@@ -119,8 +119,8 @@ AC_CHECK_FUNCS([memcpy memmove])
 
 # Check for system zlib
 
+# don't quote AS_HELP_STRING!
 AC_ARG_WITH([zlib],
-  dnl don't quote AS_HELP_STRING!
   AS_HELP_STRING([--without-zlib],
                  [use internal zlib instead of system-wide]))
 if test x$with_zlib != xno && test -z "$LIBZ"; then
@@ -135,8 +135,8 @@ fi
 
 # Whether to use Mac OS resource-based fonts.
 
+# don't quote AS_HELP_STRING!
 AC_ARG_WITH([old-mac-fonts],
-  dnl don't quote AS_HELP_STRING!
   AS_HELP_STRING([--with-old-mac-fonts],
                  [allow Mac resource-based fonts to be used]))
 if test x$with_old_mac_fonts = xyes; then
@@ -348,8 +348,8 @@ fi
 
 # Whether to use AppleTypeService since Mac OS X.
 
+# don't quote AS_HELP_STRING!
 AC_ARG_WITH([ats],
-  dnl don't quote AS_HELP_STRING!
   AS_HELP_STRING([--with-ats],
                  [use AppleTypeService, if available (default=yes)]))
 if test x$with_ats = xno; then