diff --git a/configure.in b/configure.in
index a5fe8d292da..c272efe9214 100644
--- a/configure.in
+++ b/configure.in
@@ -87,7 +87,6 @@ sinclude(config/ac-macros/character_sets.m4)
 sinclude(config/ac-macros/compiler_flag.m4)
 sinclude(config/ac-macros/plugins.m4)
 sinclude(config/ac-macros/dtrace.m4)
-sinclude(config/ac-macros/ha_ndbcluster.m4)
 sinclude(config/ac-macros/large_file.m4)
 sinclude(config/ac-macros/misc.m4)
 sinclude(config/ac-macros/readline.m4)
diff --git a/config/ac-macros/ha_ndbcluster.m4 b/storage/ndb/ndb_configure.m4
similarity index 100%
rename from config/ac-macros/ha_ndbcluster.m4
rename to storage/ndb/ndb_configure.m4
diff --git a/storage/ndb/plug.in b/storage/ndb/plug.in
index a7e351417b1..d3395b66771 100644
--- a/storage/ndb/plug.in
+++ b/storage/ndb/plug.in
@@ -1,3 +1,5 @@
+sinclude(storage/ndb/ndb_configure.m4)
+
 MYSQL_STORAGE_ENGINE(ndbcluster, ndbcluster, [Cluster Storage Engine],
         [High Availability Clustered tables], [max])
 MYSQL_PLUGIN_DIRECTORY(ndbcluster,[storage/ndb])