diff --git a/eclipse-egit.spec b/eclipse-egit.spec
index 69120af..5b8b4d3 100644
--- a/eclipse-egit.spec
+++ b/eclipse-egit.spec
@@ -1,23 +1,25 @@
-%global gittag 5.3.0.201903130848-r
+%global gittag 5.4.0.201905221418-m3
 
 Name:             eclipse-egit
-Version:          5.3.0
-Release:          2%{?dist}
+Version:          5.4.0
+Release:          0.1%{?dist}
 Summary:          Eclipse Git Integration
 
 License:          EPL-2.0
 URL:              http://www.eclipse.org/egit
-Source0:          http://git.eclipse.org/c/egit/egit.git/snapshot/egit-%{gittag}.tar.xz
+Source0:          https://git.eclipse.org/c/egit/egit.git/snapshot/egit-%{gittag}.tar.xz
 
 BuildRequires:    tycho
 BuildRequires:    maven-antrun-plugin
-BuildRequires:    eclipse-platform >= 1:4.6.0
+BuildRequires:    eclipse-platform
 BuildRequires:    eclipse-jdt
 BuildRequires:    eclipse-jgit >= %{version}
+BuildRequires:    jgit >= %{version}
 BuildRequires:    eclipse-license2
 BuildRequires:    eclipse-mylyn
-Requires:         eclipse-platform >= 1:4.6.0
+Requires:         eclipse-platform
 Requires:         eclipse-jgit >= %{version}
+Requires:         jgit >= %{version}
 
 BuildArch:        noarch
 
@@ -37,9 +39,6 @@ Git integration for mylyn.
 %prep
 %setup -q -n egit-%{gittag}
 
-# Fix license req
-sed -i -e '/license-feature-version/s/2.0.0/0.0.0/' */feature.xml
-
 # Disable unnecessary plugins for RPM builds
 %pom_remove_plugin :maven-enforcer-plugin
 
@@ -53,10 +52,15 @@ sed -i -e '/license-feature-version/s/2.0.0/0.0.0/' */feature.xml
 %pom_disable_module org.eclipse.egit.source-feature
 %pom_disable_module org.eclipse.egit.target
 
+# Relax jsch dep
+sed -i -e 's/0\.1\.55/0.1.54/' org.eclipse.egit-feature/feature.xml
+
+# Ensure correct apache sshd bundle gets symlinked
+sed -i -e '/jsch/a<import plugin="org.apache.sshd.osgi"/>' org.eclipse.egit-feature/feature.xml
+
 # Disable tests
 %pom_disable_module org.eclipse.egit.core.test
 %pom_disable_module org.eclipse.egit.ui.test
-%pom_disable_module org.eclipse.egit.ui.importer.tests
 %pom_disable_module org.eclipse.egit.gitflow.test
 %pom_disable_module org.eclipse.egit.mylyn.ui.test
 
@@ -79,6 +83,9 @@ sed -i -e '/license-feature-version/s/2.0.0/0.0.0/' */feature.xml
 %doc README.md
 
 %changelog
+* Fri May 31 2019 Mat Booth <mat.booth@redhat.com> - 5.4.0-0.1
+- Update to latest milestone release
+
 * Sat Mar 16 2019 Mat Booth <mat.booth@redhat.com> - 5.3.0-2
 - Rebuild against apache sshd 2
 
diff --git a/sources b/sources
index 9b12ee9..2c1b2bf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (egit-5.3.0.201903130848-r.tar.xz) = 02e6a6ab613d89c6cbfaa1fbe728e0f917b165f95b4849ffdbad933570d729248c50c4f31169af370c190a09221ca29395ee7996cd246c8fed4e67e198593e88
+SHA512 (egit-5.4.0.201905221418-m3.tar.xz) = faa109005e0616fa5761a374c1b895d95e65bededb4e7324dd594c23da819c06634034900fae6646725beab65dfe6b7eca43435b0a2f722339d62e2e67cdf40b