diff --git a/CHANGES.txt b/CHANGES.txt
index 09635e8331..565f362b7a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 4.0-alpha5
+ * Add fqltool and auditlogviewer to rpm and deb packages (CASSANDRA-14712)
  * Include DROPPED_COLUMNS in schema digest computation (CASSANDRA-15843)
  * Fix Cassandra restart from rpm install (CASSANDRA-15830)
  * Improve handling of 2i initialization failures (CASSANDRA-13606)
diff --git a/debian/cassandra.install b/debian/cassandra.install
index da800a48db..be34838750 100644
--- a/debian/cassandra.install
+++ b/debian/cassandra.install
@@ -21,6 +21,8 @@ bin/sstablescrub usr/bin
 bin/sstableupgrade usr/bin
 bin/sstableverify usr/bin
 tools/bin/cassandra-stress usr/bin
+tools/bin/fqltool usr/bin
+tools/bin/auditlogviewer usr/bin
 lib/*.jar usr/share/cassandra/lib
 lib/*.zip usr/share/cassandra/lib
 lib/sigar-bin/* usr/share/cassandra/lib/sigar-bin
diff --git a/debian/rules b/debian/rules
index 53874c2180..e7fa32f926 100755
--- a/debian/rules
+++ b/debian/rules
@@ -51,6 +51,10 @@ install: build
 	dh_install build/tools/lib/stress.jar \
 		usr/share/cassandra
 
+	# Copy fqltool jars
+	dh_install build/tools/lib/fqltool.jar \
+		usr/share/cassandra
+
 	dh_link usr/share/cassandra/apache-cassandra-$(VERSION).jar \
 		usr/share/cassandra/apache-cassandra.jar
 
diff --git a/redhat/cassandra b/redhat/cassandra
index 97a0447435..77622b6258 100644
--- a/redhat/cassandra
+++ b/redhat/cassandra
@@ -34,7 +34,7 @@ lock_file=/var/lock/subsys/$NAME
 CASSANDRA_PROG=/usr/sbin/cassandra
 
 # The first existing directory is used for JAVA_HOME if needed.
-JVM_SEARCH_DIRS="/usr/lib/jvm/jre /usr/lib/jvm/jre-1.7.* /usr/lib/jvm/java-1.7.*/jre"
+JVM_SEARCH_DIRS="/usr/lib/jvm/jre /usr/lib/jvm/jre-1.8.* /usr/lib/jvm/java-1.8.*/jre"
 
 # Read configuration variable file if it is present
 [ -r /etc/default/$NAME ] && . /etc/default/$NAME
diff --git a/redhat/cassandra.spec b/redhat/cassandra.spec
index 9ca9f4c168..f42ab83656 100644
--- a/redhat/cassandra.spec
+++ b/redhat/cassandra.spec
@@ -100,6 +100,9 @@ cp -pr lib/* %{buildroot}/usr/share/%{username}/lib/
 # copy stress jar
 cp -p build/tools/lib/stress.jar %{buildroot}/usr/share/%{username}/
 
+# copy fqltool jar
+cp -p build/tools/lib/fqltool.jar %{buildroot}/usr/share/%{username}/
+
 # copy binaries
 mv bin/cassandra %{buildroot}/usr/sbin/
 cp -p bin/* %{buildroot}/usr/bin/
@@ -177,6 +180,8 @@ This package contains extra tools for working with Cassandra clusters.
 %attr(755,root,root) %{_bindir}/sstableofflinerelevel
 %attr(755,root,root) %{_bindir}/sstablerepairedset
 %attr(755,root,root) %{_bindir}/sstablesplit
+%attr(755,root,root) %{_bindir}/auditlogviewer
+%attr(755,root,root) %{_bindir}/fqltool
 
 
 %changelog