diff --git a/.cvsignore b/.cvsignore
index 792fef8..f203289 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-epic-0.6.33.tar.gz
+epic-0.6.35.tar.gz
diff --git a/eclipse-epic.spec b/eclipse-epic.spec
index 28ec3dd..05c761e 100644
--- a/eclipse-epic.spec
+++ b/eclipse-epic.spec
@@ -1,8 +1,7 @@
 %define eclipse_base     %{_libdir}/eclipse
-%define gcj_support      1
 
 Name:      eclipse-epic
-Version:   0.6.33
+Version:   0.6.35
 Release:   1%{?dist}
 Summary:   Perl Eclipse plugin
 Group:     Development/Tools
@@ -20,14 +19,8 @@ Patch0:    %{name}-enable-module-starter.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%if %{gcj_support}
-BuildRequires:    gcc-java
-BuildRequires:    java-gcj-compat-devel
-Requires(post):   java-gcj-compat
-Requires(postun): java-gcj-compat
-%else
 BuildArch:        noarch
-%endif
+
 BuildRequires:    java-devel
 BuildRequires:    jpackage-utils
 BuildRequires:    eclipse-pde >= 3.4
@@ -46,6 +39,7 @@ Requires:         perl
 Requires:         perl(PadWalker)
 Requires:         perl(Module::Starter)
 Requires:         perl(Test::Simple)
+Requires:         perl(Perl::Tidy)
 
 %description
 EPIC is an open source Perl IDE based on the Eclipse platform. Features 
@@ -130,28 +124,22 @@ for p in org.epic.perleditor \
 done
 popd
 
-%if %{gcj_support}
-%{_bindir}/aot-compile-rpm
-%endif
-
 %clean
 rm -rf %{buildroot}
 
-%if %{gcj_support}
-%post -p %{_bindir}/rebuild-gcj-db
-%postun -p %{_bindir}/rebuild-gcj-db
-%endif
-
 %files
 %defattr(-,root,root,-)
 %doc org.epic.feature.main/license.html
 %{_datadir}/eclipse/dropins/epic
 
-%if %{gcj_support}
-%{_libdir}/gcj/%{name}
-%endif
-
 %changelog
+* Tue Jun 02 2009 Mat Booth <fedora@matbooth.co.uk> 0.6.35-1
+- Drop GCJ support.
+- Require Perl::Tidy for code formatting.
+- Update to version 0.6.35.
+- Fixed Bug [ 2782469 ] Step Return very slow, ends up in overload.pm
+- Fixed Bug [ 1874581 ] Outline view out of sync with comment typing/deletion
+
 * Tue Mar 24 2009 Mat Booth <fedora@matbooth.co.uk> 0.6.33-1
 - Rebuilt to omit p2 metadata.
 - Updated to version 0.6.33.
diff --git a/get-epic.sh b/get-epic.sh
index 13f65eb..e75311b 100644
--- a/get-epic.sh
+++ b/get-epic.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 NAME="epic"
-VERSION=0.6.33
-TAG="testing_0_6_33"
+VERSION=0.6.35
+TAG="testing_0_6_35"
 
 echo "Exporting from CVS..."
 mkdir $NAME-$VERSION
diff --git a/sources b/sources
index a73c9ba..7da7642 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4b0bc91498f0c9d62c5e6a658c593cf7  epic-0.6.33.tar.gz
+ed470fe7abc83303e8893d5ba0e68555  epic-0.6.35.tar.gz