diff --git a/gjdoc/gjdoc.spec b/gjdoc/gjdoc.spec
index c994c59a00..cd6d118f61 100644
--- a/gjdoc/gjdoc.spec
+++ b/gjdoc/gjdoc.spec
@@ -36,11 +36,11 @@ Class:        EVAL
 Group:        Language
 License:      LGPL
 Version:      %{V_gjdoc}
-Release:      20100110
+Release:      20100120
 
 #   list of sources
 Source0:      ftp://ftp.gnu.org/gnu/classpath/gjdoc-%{V_gjdoc}.tar.gz
-Source1:      http://www.antlr.org/download/antlr-%{V_antlr}.tar.gz
+Source1:      http://www.antlr.org/download/antlr-%{V_antlr}.jar
 Patch0:       gjdoc.patch
 
 #   build information
@@ -68,12 +68,12 @@ AutoReqProv:  no
     prog gjdoc:antlr = {
         version   = %{V_antlr}
         url       = http://www.antlr.org/download/
-        regex     = antlr-(__VER__)\.tar\.gz
+        regex     = antlr-(__VER__)\.jar
     }
 
 %prep
     %setup -q
-    %setup -q -T -D -a 1
+    cp %{SOURCE antlr-%{V_antlr}.jar} .
     %patch -p0
 
 %build
@@ -84,7 +84,7 @@ AutoReqProv:  no
         --libdir=%{l_prefix}/libexec/gjdoc \
         --mandir=%{l_prefix}/man \
         --infodir=%{l_prefix}/info \
-        --with-antlr-jar="`pwd`/`echo antlr-%{V_antlr}/lib/antlr-2*.jar`" \
+        --with-antlr-jar=`pwd`/antlr-%{V_antlr}.jar \
         --enable-native
     %{l_make} %{l_mflags -O}