diff --git a/javacc.spec b/javacc.spec
index 853f49e..7bd0fd6 100644
--- a/javacc.spec
+++ b/javacc.spec
@@ -28,13 +28,11 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-%define with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
-
 %define section free
 
 Name:           javacc
 Version:        4.1
-Release:        0.4%{?dist}
+Release:        0.5%{?dist}
 Epoch:          0
 Summary:        A parser/scanner generator for java
 License:        BSD
@@ -43,21 +41,15 @@ Source1:        javacc.sh
 Source2:        jjdoc
 Source3:        jjtree
 #Jar used for bootstrapping
-Source4:	javacc.jar
+Source4:        javacc.jar
 URL:            https://javacc.dev.java.net/
-Group:          Development/Code Generators
+Group:          Development/Tools
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 Requires:       java, jpackage-utils >= 0:1.5
 BuildRequires:  ant, ant-junit, junit >= 0:3.8.1
 BuildRequires:  java-devel, jpackage-utils >= 0:1.5
 
-%if %{with_gcj}
-BuildRequires:          java-gcj-compat-devel >= 1.0.31
-Requires(post):         java-gcj-compat >= 1.0.31
-Requires(postun):       java-gcj-compat >= 1.0.31
-%else
 BuildArch:      noarch
-%endif
 
 %description 
 Java Compiler Compiler (JavaCC) is the most popular parser generator for use
@@ -69,7 +61,7 @@ a tool called JJTree included with JavaCC), actions, debugging, etc.
 
 %package manual
 Summary:        Manual for %{name}
-Group:          Development/Documentation
+Group:          Documentation
 Requires:       %{name} = %{version}-%{release}
 
 %description manual
@@ -77,7 +69,7 @@ Manual for %{name}.
 
 %package demo
 Summary:        Examples for %{name}
-Group:          Development/Documentation
+Group:          Documentation
 Requires:       %{name} = %{version}-%{release}
 
 %description demo
@@ -115,29 +107,9 @@ install -m 755 bin/javacc bin/jjdoc bin/jjrun bin/jjtree $RPM_BUILD_ROOT/%{_bind
 install -d -m 755 $RPM_BUILD_ROOT/%{_datadir}/%{name}
 cp -pr examples $RPM_BUILD_ROOT/%{_datadir}/%{name}
 
-%if %{with_gcj}
-%{_bindir}/aot-compile-rpm
-%endif
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-%if %{with_gcj}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%postun
-%if %{with_gcj}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
 %files
 %defattr(0644,root,root,0755)
 %{_javadir}/*.jar
@@ -145,10 +117,6 @@ fi
 %defattr(0755,root,root,0755)
 /usr/bin/*
 
-%if %{with_gcj}
-%attr(-,root,root) %{_libdir}/gcj/%{name}
-%endif
-
 %files manual
 %defattr(0644,root,root,0755)
 %doc www/*
@@ -158,6 +126,10 @@ fi
 %{_datadir}/%{name}/*
 
 %changelog
+* Tue Nov 24 2009 Alexander Kurtakov <akurtako@redhat.com> 0:4.1-0.5
+- Fix rpmlint warnings.
+- Drop gcj support.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:4.1-0.4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild