diff --git a/eclipse.spec b/eclipse.spec
index 3c0c4ba..4f27918 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -20,7 +20,7 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        7%{?dist} 
+Release:        8%{?dist} 
 License:        Eclipse Public License
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -117,6 +117,7 @@ BuildRequires:  java-gcj-compat-devel >= 1.0.64
 BuildRequires:  libXt-devel
 %else
 BuildRequires:  java-devel >= 1.6.0
+BuildRequires:  java-javadoc
 BuildRequires:  libXt-devel
 %endif
 
@@ -263,12 +264,7 @@ Requires(post):    %{name}-ecj = %{epoch}:%{version}-%{release}
 Requires(postun):  %{name}-ecj = %{epoch}:%{version}-%{release}
 Requires:       junit >= 3.8.1-3jpp
 Requires:       junit4
-%if %{gcj_support}
 Requires:       java-javadoc
-# OpenJDK doesn't Provide this.  Should file a bug.
-#%else
-#Requires:       java-javadoc >= 1.6.0
-%endif
 %if %{gcj_support}
 Requires(post):     java-gcj-compat >= 1.0.64
 Requires(postun):   java-gcj-compat >= 1.0.64
@@ -1646,6 +1642,10 @@ fi
 %endif
 
 %changelog
+* Wed Apr 09 2008 Andrew Overholt <overholt@redhat.com> 3.3.2-8
+- Rather than removing java-javadoc, just add Requirement in all cases
+  (gcj or not).
+
 * Wed Apr 09 2008 Andrew Overholt <overholt@redhat.com> 3.3.2-7
 - Remove explicit java-javadoc requirements as OpenJDK's -devel package
   provides it.