diff --git a/javacc.changes b/javacc.changes
index 56e4efb..5ebcbf8 100644
--- a/javacc.changes
+++ b/javacc.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Wed Sep 25 11:57:00 UTC 2013 - mvyskocil@suse.com
+
+- Build with gcc-java as openjdk7 (1.7.0_40) fails to build it
+
+-------------------------------------------------------------------
+Mon Sep  9 11:05:54 UTC 2013 - tchvatal@suse.com
+
+- Move from jpackage-utils to javapackage-tools
+
 -------------------------------------------------------------------
 Mon Jan 28 15:00:14 CET 2008 - mmaher@suse.de
 
diff --git a/javacc.spec b/javacc.spec
index 267c93a..a45248d 100644
--- a/javacc.spec
+++ b/javacc.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package javacc (Version 4.0)
+# spec file for package javacc
 #
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,26 +15,25 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
-
 
 Name:           javacc
-BuildRequires:  ant java2-devel-packages xml-commons-apis
-%define section free
 Version:        4.0
-Release:        108
+Release:        0
 Summary:        A Parser and Scanner Generator for Java
 License:        BSD-3-Clause
+Group:          Development/Libraries/Java
 Source0:        %{name}-%{version}src.tar.gz
 Source1:        javacc
 Source2:        jjdoc
 Source3:        jjtree
 Patch:          javacc.patch
 Url:            https://javacc.dev.java.net/
-Group:          Development/Libraries/Java
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
-Requires:       jpackage-utils >= 1.5
+Requires:       javapackages-tools
+BuildRequires:  ant
+BuildRequires:  java-1_5_0-gcj-compat-devel
+BuildRequires:  xml-commons-apis
 
 %description 
 Java Compiler Compiler (JavaCC) is the most popular parser generator
@@ -48,7 +47,6 @@ with JavaCC), actions, debugging, etc.
 
 
 %package manual
-License:        BSD-3-Clause
 Summary:        A Parser and Scanner Generator for Java
 Group:          Development/Libraries/Java
 
@@ -64,7 +62,6 @@ with JavaCC), actions, debugging, etc.
 
 
 %package demo
-License:        BSD-3-Clause
 Summary:        A Parser and Scanner Generator for Java
 Group:          Development/Libraries/Java
 
@@ -126,22 +123,3 @@ rm -rf $RPM_BUILD_ROOT
 /usr/share/%{name}/
 
 %changelog
-* Mon Jan 28 2008 mmaher@suse.de
-- updated to 4.0:
-  See the bug list in issue tracker for all the bugs fixed in this release.
-  JJTree and JavaCC both now support 1.5 syntax.
-  We now support accessing token fields in the grammar like: s=<ID>.image
-  Convenient constructors for passing encoding directly to the grammar
-  Tabsetting is now customizable.
-  SimpleNode can now extend a class using the NODE_EXTENDS option.
-  JAVACODE and BNF productions take optional access modifiers.
-* Wed Sep 20 2006 ro@suse.de
-- set source=1.4 for java
-* Wed Jan 25 2006 mls@suse.de
-- converted neededforbuild to BuildRequires
-* Tue Oct 18 2005 jsmeix@suse.de
-- Current version 3.2 from JPackage.org
-* Wed Sep 28 2005 dmueller@suse.de
-- add norootforbuild
-* Fri Feb 18 2005 skh@suse.de
-- initial package