diff --git a/config/ChangeLog b/config/ChangeLog
index 743da73bb..d6ff5652d 100644
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,7 @@
+2009-05-26  Rafael Avila de Espindola  <espindola@google.com>
+
+	* plugins.m4: New.
+
 2009-05-12  Alexandre Oliva  <aoliva@redhat.com>
 
 	* multi.m4: Save CXX, GFORTRAN and GCJ in config.status.
diff --git a/config/plugins.m4 b/config/plugins.m4
new file mode 100644
index 000000000..7ee8412aa
--- /dev/null
+++ b/config/plugins.m4
@@ -0,0 +1,11 @@
+AC_DEFUN([AC_PLUGINS],
+[
+AC_ARG_ENABLE([plugins],
+AS_HELP_STRING([--enable-plugins], [Enable support for plugins (defaults no)]),
+[case "${enableval}" in
+  yes | "") plugins=yes ;;
+  no) plugins=no ;;
+  *) plugins=yes ;;
+ esac],
+[plugins=no])
+])