diff --git a/.gitignore b/.gitignore
index bd8b66d..af04170 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /metro-xmlstreambuffer-1.5.10.tar.gz
+/metro-xmlstreambuffer-2.1.0.tar.gz
diff --git a/sources b/sources
index dbc07bd..5c59a82 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (metro-xmlstreambuffer-1.5.10.tar.gz) = 9015afb48bb874a53b60202a99ead291d9c3ac0cdfbb08a0c3c932574a768a84b5135be51d5e48cdd37a1a61c02859e2d4fffe7ae2629cb4ca4bccc4129887dd
+SHA512 (metro-xmlstreambuffer-2.1.0.tar.gz) = c277aa96594ca4d6509ed2aa737fbe12d29b115041d3656e25f2ab05aafe7ce4b07c5f98a4d1f39927687fe038b567d317ca04382aa272a0eba528aaab329050
diff --git a/xmlstreambuffer.spec b/xmlstreambuffer.spec
index c2ff55f..48716a2 100644
--- a/xmlstreambuffer.spec
+++ b/xmlstreambuffer.spec
@@ -1,18 +1,16 @@
-%global srcname metro-xmlstreambuffer
-
 Name:           xmlstreambuffer
-Version:        1.5.10
-Release:        7%{?dist}
+Version:        2.1.0
+Release:        1%{?dist}
 Summary:        Stream Based Representation for XML Infoset
 License:        BSD
 URL:            https://github.com/eclipse-ee4j/metro-xmlstreambuffer
 BuildArch:      noarch
 ExclusiveArch:  %{java_arches} noarch
 
-Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
+Source0:        %{url}/archive/%{version}/metro-xmlstreambuffer-%{version}.tar.gz
 
 BuildRequires:  maven-local
-BuildRequires:  mvn(com.sun.activation:jakarta.activation)
+BuildRequires:  mvn(jakarta.activation:jakarta.activation-api)
 BuildRequires:  mvn(org.codehaus.mojo:build-helper-maven-plugin)
 BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
 BuildRequires:  mvn(org.jvnet.staxex:stax-ex)
@@ -21,14 +19,19 @@ BuildRequires:  mvn(junit:junit)
 %description
 Stream based representation for XML infoset.
 
+%package javadoc
+Summary:        Javadoc for %{name}
+
+%description javadoc
+This package contains javadoc for %{name}.
+
 %prep
-%autosetup -n %{srcname}-%{version}
+%setup -q -n metro-xmlstreambuffer-%{version}
 
 pushd streambuffer
-# remove unnecessary dependency on parent POM
+
 %pom_remove_parent
 
-# remove unnecessary maven plugins
 %pom_remove_plugin :buildnumber-maven-plugin
 %pom_remove_plugin :glassfish-copyright-maven-plugin
 %pom_remove_plugin :maven-enforcer-plugin
@@ -38,7 +41,7 @@ popd
 
 %build
 pushd streambuffer
-%mvn_build -j -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 -DbuildNumber=unknown
+%mvn_build
 popd
 
 %install
@@ -50,7 +53,13 @@ popd
 %license LICENSE.md NOTICE.md
 %doc CONTRIBUTING.md README.md
 
+%files javadoc -f streambuffer/.mfiles-javadoc
+%license LICENSE.md NOTICE.md
+
 %changelog
+* Mon Nov 21 2022 Marian Koncek <mkoncek@redhat.com> - 2.1.0-1
+- Update to upstream version 2.1.0
+
 * Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.10-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 
@@ -157,4 +166,3 @@ popd
 
 * Sat Mar 31 2012 gil cattaneo <puntogil@libero.it> 1.4-1
 - initial rpm
-