diff --git a/.cvsignore b/.cvsignore
index 57b522b..d6c1a01 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -3,3 +3,4 @@ jdepend-2.6
 noarch
 *.src.rpm
 
+jdepend-2.9.zip
diff --git a/jdepend.spec b/jdepend.spec
index 37bc958..749d559 100644
--- a/jdepend.spec
+++ b/jdepend.spec
@@ -28,33 +28,19 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-%define _with_gcj_support 1
-
-%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
-
-%define section		free
-
 Name:		jdepend
-Version:	2.6
-Release:	9.4%{?dist}
+Version:	2.9
+Release:	1%{?dist}
 Epoch:		0
 Summary:        Java Design Quality Metrics
 License:        BSD
-Url:            http://www.clarkware.com/
+URL:            http://www.clarkware.com/
 Group:          Development/Libraries/Java
-Source0:        %{url}software/%{name}-%{version}-RHCLEAN.zip
+Source0:        %{url}software/%{name}-%{version}.zip
 BuildRequires:  ant
-%if ! %{gcj_support}
 BuildArch:      noarch
-%endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-buildroot
 
-%if %{gcj_support}
-BuildRequires:		java-gcj-compat-devel
-Requires(post):		java-gcj-compat
-Requires(postun):	java-gcj-compat
-%endif
-
 %description
 JDepend traverses a set of Java class and source file directories and
 generates design quality metrics for each Java package. JDepend allows
@@ -94,69 +80,37 @@ ant jar javadoc
 %install
 # jars
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -m 644 lib/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+install -m 644 dist/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
 (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} ${jar/-%{version}/}; done)
 # javadoc
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
-rm -rf docs/api
+cp -pr build/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+rm -rf build/docs/api
 # demo
 install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}
 cp -pr sample $RPM_BUILD_ROOT%{_datadir}/%{name}
 
-%if %{gcj_support}
-%{_bindir}/aot-compile-rpm
-%endif
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%postun
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%post javadoc
-rm -f %{_javadocdir}/%{name}
-ln -s %{name}-%{version} %{_javadocdir}/%{name}
-
-%postun javadoc
-if [ "$1" = "0" ]; then
-  rm -f %{_javadocdir}/%{name}
-fi
-
-
 %files
 %defattr(-,root,root)
 %doc README LICENSE docs
 %{_javadir}/*
 
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/jdepend-2.6.jar.*
-%endif
-
 %files javadoc
 %defattr(-,root,root)
 %{_javadocdir}/%{name}-%{version}
-%ghost %doc %{_javadocdir}/%{name}
 
 %files demo
 %defattr(-,root,root)
 %{_datadir}/%{name}
 
 %changelog
+* Tue Aug 11 2009 Alexander Kurtakov <akurtako@redhat.com> 0:2.9-1
+- Update to upstream 2.9.
+- Drop gcj support.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:2.6-9.4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
diff --git a/sources b/sources
index cbee675..777dc7b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e1e40d1ac2de67c46f9a4f8ef4652cf5  jdepend-2.6-RHCLEAN.zip
+4e979c0dda766ba1dd719905ca975c7b  jdepend-2.9.zip