diff --git a/ChangeLog b/ChangeLog
index 1ac9bcf5e27..6b5823907b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-05-14  Rafael Espindola  <espindola@google.com>
+
+	* config-ml.in: don't handle --enable-shared and --enable-static.
+
 2008-05-10  Richard Sandiford  <rdsandiford@googlemail.com>
 
 	* MAINTAINERS: Update my email address.
diff --git a/config-ml.in b/config-ml.in
index 3ae19743b76..f2497ada4f8 100644
--- a/config-ml.in
+++ b/config-ml.in
@@ -135,7 +135,12 @@ do
 	*)	optarg=yes ;;
 	esac
 	enableopt=`echo ${option} | sed 's:^--::;s:=.*$::;s:-:_:g'`
-	eval $enableopt="$optarg"
+	# enable_shared and enable_static are handled by configure.
+	# Don't undo its work.
+	case $enableopt in
+	enable_shared | enable_static) ;;
+	*) eval $enableopt="$optarg" ;;
+	esac
 	;;
   --norecursion | --no-recursion)
 	ml_norecursion=yes