diff --git a/fencing/Makefile.am b/fencing/Makefile.am
index 6fabf1e76d..2f799ac44e 100644
--- a/fencing/Makefile.am
+++ b/fencing/Makefile.am
@@ -1,64 +1,62 @@
 # Author: Sun Jiang Dong <sunjd@cn.ibm.com>
 # Copyright (c) 2004 International Business Machines
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; either version 2
 # of the License, or (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 include $(top_srcdir)/Makefile.common
 
 ## binary progs
 halibdir	= $(CRM_DAEMON_DIR)
 halib_PROGRAMS	= stonithd stonith-test
 
 sbin_PROGRAMS	= stonith_admin
 sbin_SCRIPTS	= fence_legacy
 
 noinst_HEADERS	= internal.h
 
 if BUILD_XML_HELP
 man7_MANS	= stonithd.7
 endif
 
 stonith_test_SOURCES	= test.c
 
 stonith_test_LDADD	= $(top_builddir)/lib/common/libcrmcommon.la	\
-			$(top_builddir)/lib/cluster/libcrmcluster.la	\
-			$(top_builddir)/lib/fencing/libstonithd.la	\
-			$(CLUSTERLIBS)
+			$(top_builddir)/lib/fencing/libstonithd.la
 
 stonith_admin_SOURCES	= admin.c
 
 stonith_admin_LDADD	= $(top_builddir)/lib/common/libcrmcommon.la	\
 			$(top_builddir)/lib/cib/libcib.la		\
 			$(top_builddir)/lib/pengine/libpe_status.la	\
 			$(top_builddir)/lib/cluster/libcrmcluster.la	\
 			$(top_builddir)/lib/fencing/libstonithd.la	\
 			$(CLUSTERLIBS)
 
 stonithd_CPPFLAGS	= -I$(top_srcdir)/pengine $(AM_CPPFLAGS)
 stonithd_YFLAGS		= -d
 
 stonithd_CFLAGS		= $(CFLAGS_HARDENED_EXE)
 stonithd_LDFLAGS	= $(LDFLAGS_HARDENED_EXE)
 
 stonithd_LDADD		= $(top_builddir)/lib/common/libcrmcommon.la	\
 			$(top_builddir)/lib/cluster/libcrmcluster.la	\
 			$(top_builddir)/lib/fencing/libstonithd.la	\
 			$(top_builddir)/lib/pengine/libpe_status.la	\
 			$(top_builddir)/pengine/libpengine.la		\
 			$(CLUSTERLIBS)
 
 stonithd_SOURCES	= main.c commands.c remote.c
 
 CLEANFILES = $(man7_MANS) $(man8_MANS)