diff --git a/.gitignore b/.gitignore
index f390030..87bb635 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,11 @@
-jflex-1.4.1.tar.gz
-jflex-1.4.3.tar.gz
+/results_*
+/*.src.rpm
+
+/jflex-1.4.1.tar.gz
+/jflex-1.4.3.tar.gz
 /jflex-1.4.3-clean.tar.gz
 /jflex-1.5.0-clean.tar.gz
 /jflex-1.5.1-clean.tar.gz
 /jflex-1.6.0-clean.tar.gz
 /jflex-1.6.1-clean.tar.gz
+/jflex-1.7.0-clean.tar.gz
diff --git a/create-tarball.sh b/create-tarball.sh
index 849de41..90501c5 100755
--- a/create-tarball.sh
+++ b/create-tarball.sh
@@ -8,7 +8,7 @@ fi
 VERSION=${1}
 NAME="jflex"
 
-wget http://jflex.de/${NAME}-${VERSION}.tar.gz
+wget http://jflex.de/release/${NAME}-${VERSION}.tar.gz
 tar xvf ${NAME}-${VERSION}.tar.gz
 
 (
diff --git a/jflex.spec b/jflex.spec
index 68d757a..9e59603 100644
--- a/jflex.spec
+++ b/jflex.spec
@@ -3,8 +3,8 @@
 
 Summary:        Fast Scanner Generator
 Name:           jflex
-Version:        1.6.1
-Release:        14%{?dist}
+Version:        1.7.0
+Release:        1%{?dist}
 License:        BSD
 URL:            http://jflex.de/
 BuildArch:      noarch
@@ -16,20 +16,21 @@ Source3:        %{name}.png
 Source4:        %{name}.1
 Source5:        create-tarball.sh
 
-BuildRequires:  maven-local
-BuildRequires:  ant
 BuildRequires:  jflex
-BuildRequires:  junit
-BuildRequires:  sonatype-oss-parent
-BuildRequires:  java-devel
-BuildRequires:  java_cup
+BuildRequires:  maven-local
+BuildRequires:  mvn(java_cup:java_cup)
+BuildRequires:  mvn(junit:junit)
+BuildRequires:  mvn(org.apache.ant:ant)
+
 %if %{with desktop}
 BuildRequires:  desktop-file-utils
 %endif
+
 %if %{with emacs}
 BuildRequires:  emacs
 Requires:       emacs-filesystem >= %{_emacs_version}
 %endif
+
 # Explicit javapackages-tools requires since scripts use
 # /usr/share/java-utils/java-functions
 Requires:       javapackages-tools
@@ -56,13 +57,27 @@ This package provides %{summary}.
 %mvn_file : %{name}
 %pom_add_dep java_cup:java_cup
 
-%pom_remove_plugin :maven-antrun-plugin
 %pom_remove_plugin :jflex-maven-plugin
+%pom_remove_plugin :cup-maven-plugin
+%pom_remove_plugin :maven-shade-plugin
+%pom_remove_dep :cup_runtime
 
 # Tests fail with 320k stacks (default on i686), so lets increase
 # stack to 16M to avoid stack overflows.  See rhbz#1119308
 %pom_xpath_inject "pom:plugin[pom:artifactId='maven-surefire-plugin']/pom:configuration" "<argLine>-Xss16384k</argLine>"
 
+%pom_xpath_remove "pom:plugin[pom:artifactId='maven-site-plugin']" parent.xml
+%pom_xpath_remove "pom:plugin[pom:artifactId='fmt-maven-plugin']" parent.xml
+%pom_xpath_remove "pom:plugin[pom:artifactId='cup-maven-plugin']" parent.xml
+%pom_xpath_remove "pom:plugin[pom:artifactId='maven-shade-plugin']" parent.xml
+
+%pom_xpath_remove "pom:dependency[pom:artifactId='plexus-compiler-javac-errorprone']" parent.xml
+%pom_xpath_remove "pom:dependency[pom:artifactId='error_prone_core']" parent.xml
+%pom_xpath_remove "pom:compilerId" parent.xml
+%pom_xpath_remove "pom:compilerArgs" parent.xml
+
+sed -i /%%inputstreamctor/d src/main/jflex/LexScan.flex
+
 %build
 java -jar $(find-jar java_cup) -parser LexParse -interface -destdir src/main/java src/main/cup/LexParse.cup
 jflex -d src/main/java/jflex --skel src/main/jflex/skeleton.nested src/main/jflex/LexScan.flex
@@ -116,6 +131,9 @@ install -p -m 644 lib/jflex-mode.elc %{buildroot}%{_emacs_sitelispdir}/%{name}
 
 
 %changelog
+* Wed Aug 14 2019 Fabio Valentini <decathorpe@gmail.com> - 1.7.0-1
+- Update to version 1.7.0.
+
 * Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.1-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
diff --git a/sources b/sources
index c4792a8..db11992 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-90af12c08afe8aef549df5770785a917  jflex-1.6.1-clean.tar.gz
+SHA512 (jflex-1.7.0-clean.tar.gz) = e43209af453c6557796f00d5c685e5840b0013521d28e6dadcd53e689d72b5b596f1e71eacf1bf0f1b35ef9c6ddd8ee0a846900ba970f427752c04c08c794032