diff --git a/configure.ac b/configure.ac
index aae41573f3..98c58a8955 100644
--- a/configure.ac
+++ b/configure.ac
@@ -187,7 +187,7 @@ AC_ARG_WITH(initdir,
     [  --with-initdir=DIR      directory for init (rc) scripts [${INITDIR}]],
     [ INITDIR="$withval" ])
 
-OCF_ROOT_DIR="/usr/lib/ocf"
+OCF_ROOT_DIR="${prefix}/lib/ocf"
 AC_ARG_WITH(ocf-root,
     [  --with-ocf-root=DIR      directory for OCF scripts [${OCF_ROOT_DIR}]],
     [ OCF_ROOT_DIR="$withval" ])
diff --git a/heartbeat/Makefile.am b/heartbeat/Makefile.am
index eb67ff5bba..91d4090c6c 100644
--- a/heartbeat/Makefile.am
+++ b/heartbeat/Makefile.am
@@ -30,7 +30,7 @@ halibdir		= $(libexecdir)/heartbeat
 ocfdir		        = $(OCF_RA_DIR_PREFIX)/heartbeat
 
 dtddir			= $(datadir)/$(PACKAGE_NAME)
-dtd_DATA		= ra-api-1.dtd
+dtd_DATA		= ra-api-1.dtd metadata.rng
 
 if USE_IPV6ADDR_AGENT
 ocf_PROGRAMS           = IPv6addr
@@ -167,4 +167,4 @@ hb_DATA			= shellfuncs
 check: $(ocf_SCRIPTS:=.check)
 
 %.check: %
-	OCF_ROOT=. OCF_FUNCTIONS_DIR=. ./$< meta-data | xmllint --noout --relaxng metadata.rng -
+	OCF_ROOT=$(abs_srcdir) OCF_FUNCTIONS_DIR=$(abs_srcdir) ./$< meta-data | xmllint --path $(abs_srcdir) --noout --relaxng $(abs_srcdir)/metadata.rng -
diff --git a/make/release.mk b/make/release.mk
index f8cf5b249d..4312d6bc32 100644
--- a/make/release.mk
+++ b/make/release.mk
@@ -35,7 +35,7 @@ endif
 tarballs: tag
 	./autogen.sh
 	./configure
-	make distcheck
+	DISTCHECK_CONFIGURE_FLAGS="--with-systemdsystemunitdir=no" make distcheck
 
 sha256: tarballs $(project)-$(version).sha256