diff --git a/.gitignore b/.gitignore
index e798327..94a9f70 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /pki-10.6.3.tar.gz
+/pki-10.6.4.tar.gz
diff --git a/dogtag-pki.spec b/dogtag-pki.spec
index ebdd34b..7f12346 100644
--- a/dogtag-pki.spec
+++ b/dogtag-pki.spec
@@ -15,8 +15,8 @@ License:          GPLv2 and LGPLv2
 ExcludeArch:      aarch64 s390x
 %endif
 
-Version:          10.6.3
-Release:          2%{?_timestamp}%{?_commit_id}%{?dist}
+Version:          10.6.4
+Release:          1%{?_timestamp}%{?_commit_id}%{?dist}
 # global           _phase -a1
 
 # To create a tarball from a version tag:
@@ -279,9 +279,13 @@ BuildRequires:    python2-pyflakes >= 1.2.3
 %endif  # with_python2
 
 %if 0%{?with_python3}
+%if 0%{?rhel} && 0%{?rhel} <= 7
+# no pylint
+%else
 BuildRequires:    python3-pylint
 BuildRequires:    python3-flake8 >= 2.5.4
 BuildRequires:    python3-pyflakes >= 1.2.3
+%endif
 %endif  # with_python3
 
 %if 0%{?with_python2}
@@ -332,8 +336,8 @@ BuildRequires:    jpackage-utils >= 0:1.7.5-10
 BuildRequires:    jss >= 4.4.0-11
 BuildRequires:    tomcatjss >= 7.2.1-4
 %else
-BuildRequires:    jss >= 4.5.0-0.3
-BuildRequires:    tomcatjss >= 7.3.2
+BuildRequires:    jss >= 4.5.0-0.4
+BuildRequires:    tomcatjss >= 7.3.3
 %endif
 BuildRequires:    systemd-units
 
@@ -423,7 +427,7 @@ Requires:         jpackage-utils >= 0:1.7.5-10
 %if 0%{?rhel} && 0%{?rhel} <= 7
 Requires:         jss >= 4.4.0-11
 %else
-Requires:         jss >= 4.5.0-0.3
+Requires:         jss >= 4.5.0-0.4
 %endif
 Requires:         nss >= 3.36.1
 
@@ -562,7 +566,7 @@ Requires:         jpackage-utils >= 0:1.7.5-10
 %if 0%{?rhel} && 0%{?rhel} <= 7
 Requires:         jss >= 4.4.0-11
 %else
-Requires:         jss >= 4.5.0-0.3
+Requires:         jss >= 4.5.0-0.4
 %endif
 Requires:         ldapjdk >= 4.19-5
 Requires:         pki-base >= %{version}-%{release}
@@ -712,7 +716,7 @@ Requires(pre):    shadow-utils
 %if 0%{?rhel} && 0%{?rhel} <= 7
 Requires:         tomcatjss >= 7.2.1-4
 %else
-Requires:         tomcatjss >= 7.3.2
+Requires:         tomcatjss >= 7.3.3
 %endif
 
 %if 0%{?rhel} && 0%{?rhel} <= 7
@@ -1160,7 +1164,7 @@ mv %{buildroot}%{_datadir}/pki/server/upgrade/10.5.5/01-AddTPSExternalRegISEtoke
 
 %endif
 
-# Customize server library links in /usr/share/pki/server/common/lib
+# Customize server common library links in /usr/share/pki/server/common/lib
 %if 0%{?fedora} || 0%{?rhel} > 7
     rm -f %{buildroot}%{_datadir}/pki/server/common/lib/scannotation.jar
     rm -f %{buildroot}%{_datadir}/pki/server/common/lib/resteasy-jaxrs-api.jar
@@ -1189,6 +1193,11 @@ fi
 
 %endif
 
+# Customize server library links in /usr/share/pki/server/lib
+%if 0%{?rhel} && 0%{?rhel} <= 7
+    rm -f %{buildroot}%{_datadir}/pki/server/lib/slf4j-jdk14.jar
+%endif
+
 %if 0%{?rhel} && 0%{?rhel} <= 7
 # no pylint
 %else
@@ -1703,6 +1712,9 @@ fi
 
 ################################################################################
 %changelog
+* Fri Jul 20 2018 Dogtag PKI Team <pki-devel@redhat.com> - 10.6.4-1
+- Rebased to PKI 10.6.4
+
 * Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 10.6.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
diff --git a/sources b/sources
index 91d65ca..a93f40f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (pki-10.6.3.tar.gz) = 032b351282c9576411377e20e62f6d24bd429f48a47d8689989547925ffe7d319560f5c030913b8d505c5c7307b708ce56bcca13e7caa355e3e7c2c9d907bfea
+SHA512 (pki-10.6.4.tar.gz) = ec521f9f50a36c3fc5032d3029d1fc264efaac0f9684f7800fa009a12c3f8649e7f53a99d1b44100e27eb22aaac2f3217d6a951113dd72b97c34d20b5aef2a1b