diff --git a/heartbeat/Makefile.am b/heartbeat/Makefile.am
index 1276386c9..71280beca 100644
--- a/heartbeat/Makefile.am
+++ b/heartbeat/Makefile.am
@@ -1,177 +1,178 @@
 # Makefile.am for OCF RAs
 #
 # Author: Sun Jing Dong
 # Copyright (C) 2004 IBM
 #
 # 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
 
 EXTRA_DIST		= $(ocf_SCRIPTS) $(ocfcommon_DATA) \
 			  $(common_DATA) $(hb_DATA) $(dtd_DATA) \
 			  README
 
 AM_CPPFLAGS		= -I$(top_srcdir)/include -I$(top_srcdir)/linux-ha
 
 halibdir		= $(libexecdir)/heartbeat
 
 ocfdir		        = $(OCF_RA_DIR_PREFIX)/heartbeat
 
 dtddir			= $(datadir)/$(PACKAGE_NAME)
 dtd_DATA		= ra-api-1.dtd metadata.rng
 
 if USE_IPV6ADDR_AGENT
 ocf_PROGRAMS           = IPv6addr
 else
 ocf_PROGRAMS           =
 endif
 
 if IPV6ADDR_COMPATIBLE
 halib_PROGRAMS         = send_ua
 else
 halib_PROGRAMS         =
 endif
 
 IPv6addr_SOURCES        = IPv6addr.c IPv6addr_utils.c
 send_ua_SOURCES         = send_ua.c IPv6addr_utils.c
 
 IPv6addr_LDADD          = -lplumb $(LIBNETLIBS)
 send_ua_LDADD           = $(LIBNETLIBS)
 
 ocf_SCRIPTS	     =  AoEtarget		\
 			AudibleAlarm		\
 			ClusterMon		\
 			CTDB			\
 			Delay			\
 			Dummy			\
 			EvmsSCC			\
 			Evmsd			\
 			Filesystem		\
 			ICP			\
 			IPaddr			\
 			IPaddr2			\
 			IPsrcaddr		\
 			LVM			\
 			LinuxSCSI		\
 			lvmlockd		\
 			MailTo			\
 			ManageRAID		\
 			ManageVE		\
 			NodeUtilization	\
 			Pure-FTPd		\
 			Raid1			\
 			Route			\
 			SAPDatabase		\
 			SAPInstance		\
 			SendArp			\
 			ServeRAID		\
 			SphinxSearchDaemon	\
 			Squid			\
 			Stateful		\
 			SysInfo			\
 			VIPArip			\
 			VirtualDomain		\
 			WAS			\
 			WAS6			\
 			WinPopup		\
 			Xen			\
 			Xinetd			\
 			ZFS			\
 			anything		\
 			apache			\
 			asterisk		\
 			aws-vpc-route53		\
 			awseip			\
 			awsvip			\
 			clvm			\
 			conntrackd		\
 			db2			\
 			dhcpd			\
 			dnsupdate		\
 			docker			\
 			eDir88			\
 			ethmonitor		\
 			exportfs		\
 			fio			\
 			galera			\
 			garbd			\
 			iSCSILogicalUnit	\
 			iSCSITarget		\
 			ids			\
 			iface-bridge		\
 			iface-vlan		\
 			iscsi			\
 			jboss			\
 			kamailio		\
 			lxc			\
 			minio			\
 			mysql			\
 			mysql-proxy		\
 			nagios			\
 			named			\
 			nfsnotify		\
 			nfsserver		\
 			nginx			\
 			oraasm			\
 			oracle			\
 			oralsnr			\
+			ovsmonitor		\
 			pgagent			\
 			pgsql			\
 			pingd			\
 			portblock		\
 			postfix			\
 			pound			\
 			proftpd			\
 			rabbitmq-cluster	\
 			redis			\
 			rkt			\
 			rsyncd			\
 			rsyslog			\
 			scsi2reservation	\
 			sfex			\
 			sg_persist              \
 			slapd			\
 			symlink			\
 			syslog-ng		\
 			tomcat			\
 			varnish			\
 			vmware			\
 			vsftpd			\
 			zabbixserver
 
 ocfcommondir		= $(OCF_LIB_DIR_PREFIX)/heartbeat
 ocfcommon_DATA		= ocf-shellfuncs 	\
 			  ocf-binaries	 	\
 			  ocf-directories 	\
 			  ocf-returncodes 	\
  			  ocf-rarun		\
  			  ocf-distro		\
 			  apache-conf.sh 	\
 			  http-mon.sh    	\
 			  sapdb-nosha.sh	\
 			  sapdb.sh		\
 			  ora-common.sh		\
 			  mysql-common.sh	\
 			  nfsserver-redhat.sh	\
 			  findif.sh
 
 # Legacy locations
 hbdir			= $(sysconfdir)/ha.d
 hb_DATA			= shellfuncs
 
 check: $(ocf_SCRIPTS:=.check)
 
 %.check: %
 	OCF_ROOT=$(abs_srcdir) OCF_FUNCTIONS_DIR=$(abs_srcdir) ./$< meta-data | xmllint --path $(abs_srcdir) --noout --relaxng $(abs_srcdir)/metadata.rng -