diff --git a/javacc.spec b/javacc.spec
index 118b2f6..e291c7f 100644
--- a/javacc.spec
+++ b/javacc.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package javacc
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 # Copyright (c) 2000-2005, JPackage Project
 # All rights reserved.
 #
@@ -21,7 +21,7 @@
 Name:           javacc
 Version:        7.0.4
 Release:        0
-Summary:        A parser/scanner generator for java
+Summary:        A Parser and Scanner Generator for Java
 License:        BSD
 Group:          Development/Libraries/Java
 URL:            http://javacc.org
@@ -38,12 +38,13 @@ Requires:       javapackages-tools
 BuildArch:      noarch
 
 %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 recognize matches to
-the grammar. In addition to the parser generator 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.
+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
+recognize matches to the grammar. In addition to the parser generator
+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:        Manual for %{name}
@@ -70,17 +71,12 @@ This package contains the API documentation for %{name}.
 %prep
 %setup -q -n %{name}-%{version}
 
-# Remove binary information in the source tar
-find . -name "*.jar" -delete
-find . -name "*.class" -delete
-
 find ./examples -type f -exec sed -i 's/\r//' {} \;
 
-%build
-build-jar-repository -p bootstrap javacc
+# The pom dependencies are wrong
+%pom_xpath_remove pom:project/pom:dependencies
 
-# There is maven pom which doesn't really work for building. The tests don't
-# work either (even when using bundled jars).
+%build
 ant \
   -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 \
   jar javadoc
@@ -89,9 +85,16 @@ ant \
 %mvn_artifact --skip-dependencies pom.xml target/javacc-%{version}.jar
 
 %install
-%mvn_file : %{name}
-
-%mvn_install -J target/javadoc
+# jar
+install -dm 0755 %{buildroot}%{_javadir}
+install -pm 0644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
+# pom
+install -dm 0755 %{buildroot}%{_mavenpomdir}
+install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom
+%add_maven_depmap %{name}.pom %{name}.jar
+# javadoc
+install -dm 0755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/javadoc/* %{buildroot}%{_javadocdir}/%{name}/
 %fdupes -s %{buildroot}%{_javadocdir}
 %fdupes -s www
 %fdupes -s examples
@@ -115,7 +118,8 @@ ln -s %{_bindir}/javacc %{buildroot}%{_bindir}/javacc.sh
 %files demo
 %doc examples
 
-%files javadoc -f .mfiles-javadoc
+%files javadoc
 %license LICENSE
+%{_javadocdir}/%{name}
 
 %changelog