diff --git a/.gitignore b/.gitignore
index 75c9bc1..9557bc0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,10 @@
+/results_*
+/*.src.rpm
+
 /javax.servlet.jsp-api-2.2.1.tar.xz
 /javax.servlet.jsp-api-2.3.1.tar.xz
 /javax.servlet.jsp-api-2.3.2-b01.tar.xz
 /LICENSE-2.0.txt
 /cddllicense.txt
 /LICENSE.html
+/javax.servlet.jsp-api-2.3.3.tar.gz
diff --git a/generate_tarball.sh b/generate_tarball.sh
deleted file mode 100755
index 6249075..0000000
--- a/generate_tarball.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-baseurl="https://svn.java.net/svn/jsp~svn/tags/"
-pkgname="javax.servlet.jsp-api"
-
-version=`grep Version: *spec | sed -e 's/Version:\s*\(.*\)/\1/'`
-version="$version`sed -n 's/%global\s\+reltag\s\+/-/p' *.spec`"
-echo $version
-
-svn export "${baseurl}/${pkgname}-${version}"
-tar cvJf ${pkgname}-${version}.tar.xz  ${pkgname}-${version}/
diff --git a/glassfish-jsp-api.spec b/glassfish-jsp-api.spec
index 3502793..f015321 100644
--- a/glassfish-jsp-api.spec
+++ b/glassfish-jsp-api.spec
@@ -1,21 +1,14 @@
 %global artifactId javax.servlet.jsp-api
-%global jspspec 2.2
-%global reltag b01
-
 
 Name:       glassfish-jsp-api
-Version:    2.3.2
-Release:    0.12.%{reltag}%{?dist}
+Version:    2.3.3
+Release:    1%{?dist}
 Summary:    Glassfish J2EE JSP API specification
-
 License:    (CDDL-1.1 or GPLv2 with exceptions) and ASL 2.0
-URL:        http://java.net/jira/browse/JSP
-Source0:    %{artifactId}-%{version}-%{reltag}.tar.xz
-# no source releases, but this will generate tarball for you from an
-# SVN tag
-Source1:    generate_tarball.sh
-Source2:    http://www.apache.org/licenses/LICENSE-2.0.txt
-Source3:    https://javaee.github.io/glassfish/LICENSE.html
+
+URL:        https://github.com/javaee/javaee-jsp-api
+Source0:    %{url}/archive/%{artifactId}-%{version}.tar.gz
+Source1:    http://www.apache.org/licenses/LICENSE-2.0.txt
 
 BuildArch:  noarch
 
@@ -39,35 +32,44 @@ BuildArch:      noarch
 %{summary}.
 
 %prep
-%setup -q -n %{artifactId}-%{version}-%{reltag}
+%setup -q -n javaee-jsp-api-%{artifactId}-%{version}
 
-cp -p %{SOURCE2} LICENSE-ASL-2.0.txt
-cp -p %{SOURCE3} LICENSE-CDDL+GPLv2.html
+cp -p %{SOURCE1} LICENSE-ASL-2.0.txt
 
+pushd api
 # Submited upstream: http://java.net/jira/browse/JSP-31
 sed -i "/<bundle.symbolicName>/s/-api//" pom.xml
 
 %pom_xpath_remove "pom:dependency[pom:groupId='javax.el' or pom:groupId='javax.servlet']/pom:scope"
 
+%pom_remove_plugin :maven-gpg-plugin
 # javadoc generation fails due to strict doclint in JDK 8
 %pom_remove_plugin :maven-javadoc-plugin
 
 %mvn_alias : javax.servlet:jsp-api
+popd
 
 %build
+pushd api
 %mvn_build
+popd
 
 %install
+pushd api
 %mvn_install
+popd
 
-%files -f .mfiles
-%license LICENSE-ASL-2.0.txt LICENSE-CDDL+GPLv2.html
+%files -f api/.mfiles
+%license LICENSE-ASL-2.0.txt LICENSE
 
-%files javadoc -f .mfiles-javadoc
-%license LICENSE-ASL-2.0.txt LICENSE-CDDL+GPLv2.html
+%files javadoc -f api/.mfiles-javadoc
+%license LICENSE-ASL-2.0.txt LICENSE
 
 
 %changelog
+* Mon Oct 21 2019 Fabio Valentini <decathorpe@gmail.com> - 2.3.3-1
+- Update to version 2.3.3.
+
 * Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.2-0.12.b01
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
diff --git a/sources b/sources
index ad03f19..6fd208a 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
-SHA512 (javax.servlet.jsp-api-2.3.2-b01.tar.xz) = 1e6c2b1c8455ae5a07741d5f1829895ee1eab80da03b035b7f902245389bfcec50b62ccf6bd1b898feb2d52dee220b7e199ad7deb862630e4a0450e9b813f6eb
+SHA512 (javax.servlet.jsp-api-2.3.3.tar.gz) = 0531d7b745e32ce2ca1e85d7090cd6d39d19e4239a58ca100942725c829b4a2476b4f73c31096566894ef3efa40319d44c88785ecb0c1ddb68c23ab61f21855c
 SHA512 (LICENSE-2.0.txt) = 98f6b79b778f7b0a15415bd750c3a8a097d650511cb4ec8115188e115c47053fe700f578895c097051c9bc3dfb6197c2b13a15de203273e1a3218884f86e90e8
-SHA512 (LICENSE.html) = 176884e014c4bd0ecc002b0d3dc9a720ba1fa2fe1ca58afbcf9021faaa113bdaaac737e402ad881eab54816c1f5a366673bf46a541c7af2e723fb25768479126