diff --git a/.cvsignore b/.cvsignore
index 7b65792..089c964 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -6,3 +6,4 @@ jgit-9c5c2e73ba21014e3a9427b8b27c3e62fe6d1c14.tar.gz
 parallelip-egit-8c839d7ec7b884fba2e2a74321a057a58ea1114c.tar.bz2
 egit-b37b5b3088d6a749963edc3c5a07a743d7471263.tar.bz2
 egit-e49f576d207e3d31cdfc02cf57424d16e97ab6a9.tar.bz2
+egit-6b528445c3e543688b990e0a631c5f0238b02741.tar.bz2
diff --git a/eclipse-egit.spec b/eclipse-egit.spec
index 9b7c8a2..fcbdd1d 100644
--- a/eclipse-egit.spec
+++ b/eclipse-egit.spec
@@ -1,25 +1,24 @@
-%define eclipse_base     %{_libdir}/eclipse
-%define install_loc      %{_datadir}/eclipse/dropins/egit
+%global eclipse_base     %{_libdir}/eclipse
+%global install_loc      %{_datadir}/eclipse/dropins/egit
 
 Summary:          Eclipse Git plug-in
 Name:             eclipse-egit
-Version:          0.7.1
-Release:          2%{?dist}
+Version:          0.8.4
+Release:          1%{?dist}
 License:          EPL
 URL:              http://www.eclipse.org/egit/
 Group:            Development/Tools
 
-# retrieved from http://egit.eclipse.org/w/?p=egit.git;a=snapshot;h=e49f576d207e3d31cdfc02cf57424d16e97ab6a9;sf=tbz2
-Source0:          egit-e49f576d207e3d31cdfc02cf57424d16e97ab6a9.tar.bz2
-Requires:         eclipse-platform >= 1:3.4.0
-Requires:         git-core
-BuildRequires:    java-devel >= 1.6.0
+# retrieved from http://egit.eclipse.org/w/?p=egit.git;a=snapshot;h=6b528445c3e543688b990e0a631c5f0238b02741;sf=tbz2
+Source0:          egit-6b528445c3e543688b990e0a631c5f0238b02741.tar.bz2
 
+BuildRequires:    java-devel >= 1.6.0
 BuildRequires:    eclipse-pde
-BuildRequires:    eclipse-jgit >= 0.7.1
+BuildRequires:    eclipse-jgit >= 0.8.4
 BuildRequires:    jpackage-utils >= 0:1.5
-
-Requires: eclipse-jgit >= 0.7.1
+Requires:         eclipse-platform >= 1:3.4.0
+Requires:         git-core
+Requires:         eclipse-jgit >= 0.8.4
 
 BuildArch:        noarch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -29,10 +28,17 @@ The eclipse-egit package contains Eclipse plugins for
 interacting with Git repositories.
 
 %prep
-%setup -q -c 
+%setup -n eclipse-egit -q -c
+# FIXME: Work around currupted file in tarball.
+#        See https://bugs.eclipse.org/bugs/show_bug.cgi?id=317882
+NR=$((`wc -l egit/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/BranchSelectionDialog.java | \
+     cut -d' ' -f1` - 1))
+tail -n$NR egit/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/BranchSelectionDialog.java > part2.java
+echo "/*******************************************************************************" > part1.java
+cat part1.java part2.java > egit/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/BranchSelectionDialog.java
 
 %build
-%{eclipse_base}/buildscripts/pdebuild -d "jgit"
+%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.egit -d "jgit"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -51,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc egit/README
 
 %changelog
+* Thu Jun 24 2010 Severin Gehwolf <sgehwolf at, redhat.com> 0.8.4-1
+- Rebase to 0.8.4 release.
+
 * Tue Apr 13 2010 Jeff Johnston <jjohnstn@redhat.com> 0.7.1-2
 - Bump up release.
 
diff --git a/sources b/sources
index 1319b04..8302b1a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
 8219dca0daa0ad3c502d770c580d339b  egit-b37b5b3088d6a749963edc3c5a07a743d7471263.tar.bz2
 922794e4ecb631a69ecf89f7bd6d737b  egit-e49f576d207e3d31cdfc02cf57424d16e97ab6a9.tar.bz2
+b22bbe0af16b6e312e3cb5d52e27ce38  egit-6b528445c3e543688b990e0a631c5f0238b02741.tar.bz2