diff --git a/javacc-4.0src.tar.gz b/javacc-4.0src.tar.gz
deleted file mode 100644
index 8dfc418..0000000
--- a/javacc-4.0src.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:062a35b89cf1bb4260627c32f480d26e17bf4595024e4b4e472a46fe1b24655f
-size 765150
diff --git a/javacc-5.0src.tar.gz b/javacc-5.0src.tar.gz
new file mode 100644
index 0000000..68009d4
--- /dev/null
+++ b/javacc-5.0src.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:766cae9d3710054f452a7f0779db885eacfdae363152cb2e7fe025aa7ea17370
+size 810123
diff --git a/javacc.changes b/javacc.changes
index 5ebcbf8..2c86816 100644
--- a/javacc.changes
+++ b/javacc.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Jul 30 13:17:31 UTC 2015 - tchvatal@suse.com
+
+- Version bump to 5.0:
+  * No obvious changelog
+  * Works better with jdk8
+- Updated to match up with fedora version
+
 -------------------------------------------------------------------
 Wed Sep 25 11:57:00 UTC 2013 - mvyskocil@suse.com
 
diff --git a/javacc.spec b/javacc.spec
index a45248d..351f768 100644
--- a/javacc.spec
+++ b/javacc.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package javacc
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,25 +17,25 @@
 
 
 Name:           javacc
-Version:        4.0
+Version:        5.0
 Release:        0
 Summary:        A Parser and Scanner Generator for Java
 License:        BSD-3-Clause
 Group:          Development/Libraries/Java
-Source0:        %{name}-%{version}src.tar.gz
+Url:            http://javacc.java.net/
+Source0:        http://java.net/projects/%{name}/downloads/download/%{name}-%{version}src.tar.gz
 Source1:        javacc
 Source2:        jjdoc
 Source3:        jjtree
-Patch:          javacc.patch
-Url:            https://javacc.dev.java.net/
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildArch:      noarch
-Requires:       javapackages-tools
+Patch0:         javacc.patch
 BuildRequires:  ant
 BuildRequires:  java-1_5_0-gcj-compat-devel
 BuildRequires:  xml-commons-apis
+Requires:       javapackages-tools
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildArch:      noarch
 
-%description 
+%description
 Java Compiler Compiler (JavaCC) is the most popular parser generator
 for use with Java applications. A parser generator is a tool that reads
 a grammar specification and converts it to a Java program that can
@@ -44,8 +44,6 @@ itself, JavaCC provides other standard capabilities related to parser
 generation such as tree building (via a tool called JJTree included
 with JavaCC), actions, debugging, etc.
 
-
-
 %package manual
 Summary:        A Parser and Scanner Generator for Java
 Group:          Development/Libraries/Java
@@ -59,8 +57,6 @@ itself, JavaCC provides other standard capabilities related to parser
 generation such as tree building (via a tool called JJTree included
 with JavaCC), actions, debugging, etc.
 
-
-
 %package demo
 Summary:        A Parser and Scanner Generator for Java
 Group:          Development/Libraries/Java
@@ -74,11 +70,9 @@ itself, JavaCC provides other standard capabilities related to parser
 generation such as tree building (via a tool called JJTree included
 with JavaCC), actions, debugging, etc.
 
-
-
 %prep
-%setup -n javacc
-%patch -p1
+%setup -q -n javacc
+%patch0 -p1
 cp %{SOURCE1} javacc
 cp %{SOURCE2} jjdoc
 cp %{SOURCE3} jjtree
@@ -96,23 +90,20 @@ ant \
   jar
 
 %install
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -m 644 bin/lib/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-install -d -m 755 $RPM_BUILD_ROOT/usr/bin
-install -m 755 javacc jjdoc jjtree $RPM_BUILD_ROOT/usr/bin
-install -d -m 755 $RPM_BUILD_ROOT/usr/share/%{name}
-cp -pr examples $RPM_BUILD_ROOT/usr/share/%{name}
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+install -d -m 755 %{buildroot}%{_javadir}
+install -m 644 bin/lib/%{name}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
+ln -s %{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
+install -d -m 755 %{buildroot}%{_prefix}/bin
+install -m 755 javacc jjdoc jjtree %{buildroot}%{_prefix}/bin
+install -d -m 755 %{buildroot}%{_datadir}/%{name}
+cp -pr examples %{buildroot}%{_datadir}/%{name}
 
 %files
 %defattr(0644,root,root,0755)
 %{_javadir}/*.jar
 %doc LICENSE README
 %defattr(0755,root,root,0755)
-/usr/bin/*
+%{_bindir}/*
 
 %files manual
 %defattr(0644,root,root,0755)
@@ -120,6 +111,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files demo
 %defattr(0644,root,root,0755)
-/usr/share/%{name}/
+%{_datadir}/%{name}/
 
 %changelog