diff --git a/configure.ac b/configure.ac
index aa251623a..82ffdb5d9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -935,7 +935,7 @@ if test "x$enable_cluster" = xyes; then
     AC_DEFINE([CLUSTER], [], [Spice cluster support])
     LIBS="$LIBS -lpthread"
 fi
-AM_CONDITIONAL([HAVE_CLUSTER_WANTED], [test "x$enable_cluster" = xyes])
+AM_CONDITIONAL([CLUSTER_WANTED], [test "x$enable_cluster" = xyes])
 
 if test "x$enable_expdevices" = xyes; then
     AC_DEFINE([EXP_DEV], [], [Define if we want to enable experimental devices])
diff --git a/src/spicelib/analysis/Makefile.am b/src/spicelib/analysis/Makefile.am
index fef0aae88..61e3f5916 100644
--- a/src/spicelib/analysis/Makefile.am
+++ b/src/spicelib/analysis/Makefile.am
@@ -97,7 +97,7 @@ libckt_la_SOURCES = \
 		transetp.c
 
 
-if HAVE_CLUSTER_WANTED
+if CLUSTER_WANTED
 libckt_la_SOURCES += cluster.c
 endif