diff --git a/3.1.0.tar.gz b/3.1.0.tar.gz
new file mode 100644
index 0000000..0239772
--- /dev/null
+++ b/3.1.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:00538e954d89c91acabecce7c9e483e28ffa9a8680e75a8d2e8681fb9175a413
+size 104409
diff --git a/glassfish-servlet-api.changes b/glassfish-servlet-api.changes
new file mode 100644
index 0000000..9122b5e
--- /dev/null
+++ b/glassfish-servlet-api.changes
@@ -0,0 +1,4 @@
+-------------------------------------------------------------------
+Tue Jan 29 12:40:33 UTC 2019 - Fridrich Strba <fstrba@suse.com>
+
+- Initial package of javax.servlet-api 3.1.0
diff --git a/glassfish-servlet-api.spec b/glassfish-servlet-api.spec
index eba889f..75b65b3 100644
--- a/glassfish-servlet-api.spec
+++ b/glassfish-servlet-api.spec
@@ -21,18 +21,18 @@ Name:           glassfish-servlet-api
 Version:        3.1.0
 Release:        0
 Summary:        Java Servlet API
-License:        (CDDL-1.0 OR GPL-2.0-with-classpath-exception) AND Apache-2.0
+License:        (CDDL-1.0 OR GPL-2.0-only WITH Classpath-exception-2.0) AND Apache-2.0
 Group:          Development/Libraries/Java
 URL:            http://servlet-spec.java.net
-# svn export https://svn.java.net/svn/glassfish~svn/tags/javax.servlet-api-3.1.0 javax.servlet-api-3.1.0
-# tar cvJf javax.servlet-api-3.1.0.tar.xz javax.servlet-api-3.1.0/
-Source0:        %{artifactId}-%{version}.tar.xz
+Source0:        https://github.com/javaee/servlet-spec/archive/%{version}.tar.gz
 Source1:        http://www.apache.org/licenses/LICENSE-2.0.txt
 Source2:        glassfish-servlet-api-build.xml
 Source3:        glassfish-servlet-api-build.properties
-BuildRequires:  fdupes ant
+BuildRequires:  ant
+BuildRequires:  fdupes
 BuildRequires:  javapackages-local
-BuildRequires:  mvn(net.java:jvnet-parent:pom:)
+BuildRequires:  jvnet-parent
+Requires:       mvn(net.java:jvnet-parent:pom:)
 BuildArch:      noarch
 
 %description
@@ -43,12 +43,13 @@ an instance of such a class by a conforming servlet container.
 
 %package javadoc
 Summary:        Javadoc for %{name}
+Group:          Development/Libraries/Java
 
 %description javadoc
 API documentation for %{name}.
 
 %prep
-%setup -q -n %{artifactId}-%{version}
+%setup -q -n servlet-spec-%{version}
 %pom_remove_plugin :maven-remote-resources-plugin
 %pom_remove_plugin :maven-javadoc-plugin
 cp -p %{SOURCE1} src/main/resources/META-INF/
diff --git a/javax.servlet-api-3.1.0.tar.xz b/javax.servlet-api-3.1.0.tar.xz
deleted file mode 100644
index f2c24f3..0000000
--- a/javax.servlet-api-3.1.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:81623b61bcce558c85ed5d3c6243713b79eb71a31c712efa3685924c29c813b9
-size 77360