diff --git a/BUILD/SETUP.sh b/BUILD/SETUP.sh
index 7677119843c..8892e1793f1 100755
--- a/BUILD/SETUP.sh
+++ b/BUILD/SETUP.sh
@@ -153,7 +153,7 @@ base_configs="--prefix=$prefix --enable-assembler "
 base_configs="$base_configs --with-extra-charsets=complex "
 base_configs="$base_configs --enable-thread-safe-client "
 base_configs="$base_configs --with-big-tables"
-base_configs="$base_configs --with-plugin-maria --with-maria-tmp-tables"
+base_configs="$base_configs --with-plugin-maria --with-maria-tmp-tables --without-plugin-innodb_plugin"
 
 if test -d "$path/../cmd-line-utils/readline"
 then
diff --git a/storage/innodb_plugin/plug.in b/storage/innodb_plugin/plug.in
index 6daa6c5daed..42915ac7426 100644
--- a/storage/innodb_plugin/plug.in
+++ b/storage/innodb_plugin/plug.in
@@ -15,7 +15,7 @@
 #
 
 MYSQL_STORAGE_ENGINE(innodb_plugin,, [InnoDB Storage Engine],
-        [Transactional Tables using InnoDB], [max,max-no-ndb])
+        [Transactional Tables using InnoDB],)
 MYSQL_PLUGIN_DIRECTORY(innodb_plugin, [storage/innodb_plugin])
 MYSQL_PLUGIN_DYNAMIC(innodb_plugin,  [ha_innodb_plugin.la])
 MYSQL_PLUGIN_ACTIONS(innodb_plugin,  [