diff --git a/crm/Makefile.am b/crm/Makefile.am
index 94af2e9b83..03f3ca38f3 100644
--- a/crm/Makefile.am
+++ b/crm/Makefile.am
@@ -1,32 +1,32 @@
 #
 # Copyright (C) 2004 Andrew Beekhof
 #
 # 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
 
 ## Subdirectories
 SUBDIRS			=  common cib crmd pengine tengine admin
 
 
 crmdir			= $(HA_VARLIBDIR)/$(HB_PKG)/crm
 
 install-exec-local:
 	$(mkinstalldirs) $(DESTDIR)$(crmdir)
 #	-chgrp $(apigid) $(DESTDIR)/$(crmdir)
 #	-chown $(ccmuid) $(DESTDIR)/$(libdir)/$(HB_PKG)
-	cp  admin_cib_test.sh $(DESTDIR)/$(libdir)/$(HB_PKG)
+	cp  $(top_srcdir)/crm/admin_cib_test.sh $(DESTDIR)/$(libdir)/$(HB_PKG)
 	-chmod 770 $(DESTDIR)/$(crmdir)
 
diff --git a/lib/plugins/lrm/Makefile.am b/lib/plugins/lrm/Makefile.am
index 60cdf82d74..267eb97e4c 100644
--- a/lib/plugins/lrm/Makefile.am
+++ b/lib/plugins/lrm/Makefile.am
@@ -1,43 +1,44 @@
 #
 # 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 \
+INCLUDES 			=	-I$(top_builddir)/include -I$(top_srcdir)/include \
+					-I$(top_builddir)/linux-ha -I$(top_srcdir)/linux-ha \
 					-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl
 
 halibdir			=	$(libdir)/@HB_PKG@
 havarlibdir			=	$(localstatedir)/lib/@HB_PKG@
 COMMONLIBS			=	$(top_builddir)/lib/clplumbing/libplumb.la   \
                         		$(GLIBLIB)
 
 lrmdir				=	$(HA_VARLIBDIR)/$(HB_PKG)/@LRM_DIR@
 plugindir               	= 	$(halibdir)/plugins/RAExec
 
 plugin_LTLIBRARIES = lsb.la ocf.la heartbeat.la
 lsb_la_SOURCES = raexeclsb.c
 lsb_la_LDFLAGS = -L$(top_builddir)/lib/pils -lpils -export-dynamic -module -avoid-version
 ocf_la_SOURCES = raexecocf.c
 ocf_la_LDFLAGS = -L$(top_builddir)/lib/pils -lpils -export-dynamic -module -avoid-version
 heartbeat_la_SOURCES = raexechb.c
 heartbeat_la_LDFLAGS = -L$(top_builddir)/lib/pils -lpils -export-dynamic -module -avoid-version
 
 install-exec-local:
 	$(mkinstalldirs) $(DESTDIR)$(lrmdir)
 	-chgrp $(apigid) $(DESTDIR)/$(lrmdir)
 	chmod 770 $(DESTDIR)/$(lrmdir)