diff --git a/fencing/Makefile.am b/fencing/Makefile.am
index db0a495be7..500fbfe3e2 100644
--- a/fencing/Makefile.am
+++ b/fencing/Makefile.am
@@ -1,20 +1,38 @@
 # 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.
 #
 MAINTAINERCLEANFILES = Makefile.in
 
 SUBDIRS = stonithd test
+
+## binary progs
+halibdir	= $(CRM_DAEMON_DIR)
+halib_PROGRAMS	= stonith-ng stonith-test
+
+stonith_test_SOURCES	= test.c
+
+stonith_test_LDADD	= $(CRYPTOLIB) $(CLUSTERLIBS)			\
+			$(top_builddir)/lib/common/libcrmcommon.la	\
+			$(top_builddir)/lib/common/libcrmcluster.la	\
+			$(top_builddir)/lib/fencing/libstonithng.la
+
+stonith_ng_SOURCES	= main.c commands.c remote.c
+
+stonith_ng_LDADD	= $(CRYPTOLIB) $(CLUSTERLIBS)			\
+			$(top_builddir)/lib/common/libcrmcommon.la	\
+			$(top_builddir)/lib/common/libcrmcluster.la	\
+			$(top_builddir)/lib/fencing/libstonithng.la
diff --git a/lib/fencing/Makefile.am b/lib/fencing/Makefile.am
index f25b112937..f0ed767288 100644
--- a/lib/fencing/Makefile.am
+++ b/lib/fencing/Makefile.am
@@ -1,35 +1,34 @@
 #  File: Makefile.am
 #  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.
 #
 MAINTAINERCLEANFILES = Makefile.in
 
 INCLUDES         = -I$(top_builddir)/include  -I$(top_srcdir)/include     \
                    -I$(top_builddir)/libltdl  -I$(top_srcdir)/libltdl     \
-		   -I$(top_builddir)/linux-ha -I$(top_srcdir)/linux-ha    \
 		   -I$(top_builddir)          -I$(top_srcdir)
 
-halibdir	 =  $(libdir)/@HB_PKG@
-havarlibdir      =  $(localstatedir)/lib/@HB_PKG@
+lib_LTLIBRARIES = libstonithd.la libstonithng.la
 
-COMMONLIBS	 =  -lplumb $(CLUSTERLIBS) 
-
-lib_LTLIBRARIES = libstonithd.la
 libstonithd_la_SOURCES = stonithd_lib.c stonithd_msg.c
-libstonithd_la_LDFLAGS = $(COMMONLIBS)
+libstonithd_la_LDFLAGS = -lplumb $(CLUSTERLIBS)
+
+libstonithng_la_SOURCES = st_client.c
+libstonithng_la_LDFLAGS = -lplumb $(CLUSTERLIBS)			\
+			$(top_builddir)/lib/common/libcrmcommon.la
 
 AM_CFLAGS = $(INCLUDES)