diff --git a/Makefile b/Makefile
index a6aebe40..2bb7a4e6 100644
--- a/Makefile
+++ b/Makefile
@@ -211,7 +211,7 @@ install-packaging-files: \
 	$(MAKE) copy-recursive SOURCEDIR=packaging/sys-etc TARGETDIR="$(DESTDIR)$(SYSCONF_DIR)" EXCLUDE_GEN="$(GENERATED)"
 	$(MAKE) copy-recursive SOURCEDIR=packaging/etc TARGETDIR="$(DESTDIR)$(PKG_SYSCONF_DIR)" EXCLUDE_GEN="$(GENERATED)"
 	$(MAKE) copy-recursive SOURCEDIR=packaging/setup TARGETDIR="$(DESTDIR)$(PKG_DATA_DIR)/../ovirt-engine/setup" EXCLUDE_GEN="$(GENERATED)"
-	for d in bin conf dbscripts etl services wildflydom4jjavaconf; do \
+	for d in bin conf dbscripts etl services wildflyjavaconf; do \
 		$(MAKE) copy-recursive SOURCEDIR="packaging/$${d}" TARGETDIR="$(DESTDIR)$(PKG_DATA_DIR)/$${d}" EXCLUDE_GEN="$(GENERATED)"; \
 	done
 
diff --git a/packaging/bin/dwh-classpath.sh b/packaging/bin/dwh-classpath.sh
index 7291cba2..280c046e 100755
--- a/packaging/bin/dwh-classpath.sh
+++ b/packaging/bin/dwh-classpath.sh
@@ -27,8 +27,8 @@ if [ -z "${JAVA_HOME}" ]; then
 	export JAVA_HOME
 fi
 
-if [ -z "${WILDFLYDOM4JJAVACONF}" ]; then
-	WILDFLYDOM4JJAVACONFDIR="$(readlink -f $(dirname $(dirname $0)))/wildflydom4jjavaconf"
+if [ -z "${WILDFLYJAVACONF}" ]; then
+	WILDFLYJAVACONFDIR="$(readlink -f $(dirname $(dirname $0)))/wildflyjavaconf"
 fi
 
 if [ -x /usr/bin/java-config ]; then
@@ -47,20 +47,23 @@ if [ -x /usr/bin/java-config ]; then
 	done
 elif [ -x /usr/bin/build-classpath ]; then
 	dom4j="$(build-classpath dom4j 2> /dev/null)"
-	[ -z "${dom4j}" ] && dom4j="$(build-classpath dom4j-eap6 2> /dev/null)"
-	[ -z "${dom4j}" ] && dom4j="$(JAVACONFDIRS=${WILDFLYDOM4JJAVACONFDIR} build-classpath dom4j 2> /dev/null)"
+	[ -z "${dom4j}" ] && dom4j="$(JAVACONFDIRS=${WILDFLYJAVACONFDIR} build-classpath dom4j 2> /dev/null)"
 	[ -n "${dom4j}" ] || die "Cannot find dom4j"
 	commons_collections="$(build-classpath apache-commons-collections 2> /dev/null)"
 	[ -z "${commons_collections}" ] && commons_collections="$(build-classpath commons-collections 2> /dev/null)"
+        [ -z "${commons_collections}" ] && commons_collections="$(JAVACONFDIRS=${WILDFLYJAVACONFDIR} build-classpath commons-collections 2> /dev/null)"
 	[ -n "${commons_collections}" ] || die "Cannot find commons-collections"
 	jackson_core="$(build-classpath jackson-core 2> /dev/null)"
 	[ -z "${jackson_core}" ] && jackson_core="$(build-classpath jackson-core 2> /dev/null)"
+        [ -z "${jackson_core}" ] && jackson_core="$(JAVACONFDIRS=${WILDFLYJAVACONFDIR} build-classpath jackson-core 2> /dev/null)"
 	[ -n "${jackson_core}" ] || die "Cannot find jackson-core"
 	jackson_databind="$(build-classpath jackson-databind 2> /dev/null)"
 	[ -z "${jackson_databind}" ] && jackson_databind="$(build-classpath jackson-databind 2> /dev/null)"
+        [ -z "${jackson_databind}" ] && jackson_databind="$(JAVACONFDIRS=${WILDFLYJAVACONFDIR} build-classpath jackson-databind 2> /dev/null)"
 	[ -n "${jackson_databind}" ] || die "Cannot find jackson-databind"
 	jackson_annotations="$(build-classpath jackson-annotations 2> /dev/null)"
 	[ -z "${jackson_annotations}" ] && jackson_annotations="$(build-classpath jackson-annotations 2> /dev/null)"
+        [ -z "${jackson_annotations}" ] && jackson_annotations="$(JAVACONFDIRS=${WILDFLYJAVACONFDIR} build-classpath jackson-annotations 2> /dev/null)"
 	[ -n "${jackson_annotations}" ] || die "Cannot find jackson-annotations"
 	if [ "${what}" = "run" ]; then
 		postgresql_jdbc="$(build-classpath postgresql-jdbc)" || die "Canot find postgreql-jdbc"
diff --git a/packaging/wildflydom4jjavaconf/java.conf b/packaging/wildflydom4jjavaconf/java.conf
deleted file mode 100644
index 0eaf4659..00000000
--- a/packaging/wildflydom4jjavaconf/java.conf
+++ /dev/null
@@ -1 +0,0 @@
-JAVA_LIBDIR=/usr/share/ovirt-engine-wildfly/modules/system/layers/base/org:/usr/share/ovirt-engine-wildfly/modules/system/layers/base/org/apache/commons/collections/main:/usr/share/ovirt-engine-wildfly/modules/system/layers/base/com/fasterxml/jackson/core/jackson-core/main:/usr/share/ovirt-engine-wildfly/modules/system/layers/base/com/fasterxml/jackson/core/jackson-databind/main:/usr/share/ovirt-engine-wildfly/modules/system/layers/base/com/fasterxml/jackson/core/jackson-annotations/main:/opt/rh/eap7/root/usr/share/java:/opt/rh/eap7/root/usr/share/wildfly/modules/system/layers/base/org:/opt/rh/eap7/root/usr/share/wildfly/modules/system/layers/base/org/apache/commons/collections/main:/opt/rh/eap7/root/usr/share/wildfly/modules/system/layers/base/com/fasterxml/jackson/core/jackson-core/main:/opt/rh/eap7/root/usr/share/wildfly/modules/system/layers/base/com/fasterxml/jackson/core/jackson-databind/main:/opt/rh/eap7/root/usr/share/wildfly/modules/system/layers/base/com/fasterxml/jackson/core/jackson-annotations/main
diff --git a/packaging/wildflydom4jjavaconf/README b/packaging/wildflyjavaconf/README
similarity index 68%
rename from packaging/wildflydom4jjavaconf/README
rename to packaging/wildflyjavaconf/README
index 4b5ddc17..5bba4bab 100644
--- a/packaging/wildflydom4jjavaconf/README
+++ b/packaging/wildflyjavaconf/README
@@ -1 +1 @@
-This directory contains a java.conf file to point java's build_classpath to wildfly's dom4j.
+This directory contains a java.conf file to point java's build_classpath.
diff --git a/packaging/wildflyjavaconf/java.conf b/packaging/wildflyjavaconf/java.conf
new file mode 100644
index 00000000..f82048af
--- /dev/null
+++ b/packaging/wildflyjavaconf/java.conf
@@ -0,0 +1 @@
+JAVA_LIBDIR=/usr/share/ovirt-engine-wildfly/modules/system/layers/base:/opt/rh/eap7/root/usr/share/java:/opt/rh/eap7/root/usr/share/wildfly/modules/system/layers/base