diff --git a/booth.spec.in b/booth.spec.in
index 1490ee7..4e9357b 100644
--- a/booth.spec.in
+++ b/booth.spec.in
@@ -1,75 +1,78 @@
-%bcond_with resource-monitor
+%bcond_with resource_monitor
 
 %global alphatag @alphatag@
 %global numcomm @numcomm@
 %global dirty @dirty@
 
 Name:           booth
 Version:        @version@
 Release:        1%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
 Summary:        The Booth Cluster Ticket Manager.
 
 Group:          System Environment/Daemons
 License:        GPLv2
 URL:            http://www.clusterlabs.org
 Source0:        %{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Provides:       booth
 
 Requires:       pacemaker
 
 BuildRequires:  autoconf automake libtool cluster-glue-libs-devel help2man
 %if %{with resource-monitor}
 BuildRequires:  pacemaker-libs-devel
 %endif
 
 %description
 Booth manages the ticket which authorizes one of the cluster sites located in
 geographically dispersed distances to run certain resources. It is designed to
 be an add-on of Pacemaker, which extends Pacemaker to support geographically
 distributed clustering.
 
 %prep
 %setup -q -n %{name}-%{version}
 
 %build
 ./autogen.sh
 
 %configure \
-%if %{with resource-monitor}
+%if %{with resource_monitor}
 	--enable-resource-monitor \
 %endif
 	--with-initddir=%{_initrddir}
 
 make all
 
 #except check
 #%check
 #make check
 
 %install
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 
 %clean
 rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
 %doc %{_docdir}/booth/README 
 %doc %{_docdir}/booth/COPYING
 %{_sbindir}/booth
 %{_sbindir}/boothd
 %config %{_sysconfdir}/booth/booth.conf.example
 %{_mandir}/man8/booth.8.gz
 %{_mandir}/man8/boothd.8.gz
 %dir /usr/lib/ocf/resource.d/pacemaker/
 /usr/lib/ocf/resource.d/pacemaker/booth-site
 %{_initrddir}/booth-arbitrator
+%if %{with resource_monitor}
+%{_sbindir}/booth_resource_monitord
+%endif
 
 
 
 %changelog
 * @date@ Autotools generated version <nobody@nowhere.org> - @version@-1-@numcomm@.@alphatag@.@dirty@
 - Autotools generated version
 
diff --git a/tools/Makefile.am b/tools/Makefile.am
index fa2b1e0..344a237 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,38 +1,40 @@
 # Copyright (C) 2012, NIPPON TELEGRAPH AND TELEPHONE CORPORATION
 # 
 # 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 MAINTAINERCLEANFILES = Makefile.in
 
 INCLUDES                = -I/usr/include/pacemaker \
                         -I/usr/include/heartbeat \
                         -I/usr/include/libxml2 \
                         -I$(srcdir)
 
 if RESOURCE_MONITOR
+noinst_HEADERS         = booth_resource_monitord.h
+
 sbin_PROGRAMS          = booth_resource_monitord
 
 # BUILD
 
 booth_resource_monitord_SOURCES        = booth_resource_monitord.c
 booth_resource_monitord_LDADD          = -lcrmcommon \
                                          -lcrmcluster \
                                          -lpe_status \
                                          -lcib
 booth_resource_monitord_CPPFLAGS       = $(GLIB_CFLAGS)
 endif
 
 
 AM_CFLAGS               = -Wall -Werror