diff --git a/.gitignore b/.gitignore
index 8ad838a..29c995d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /scram-1.0.0-beta.2.tar.gz
+/scram-2.1.tar.gz
diff --git a/ongres-scram.spec b/ongres-scram.spec
index e540736..68cde75 100644
--- a/ongres-scram.spec
+++ b/ongres-scram.spec
@@ -1,14 +1,16 @@
 %global		upstream_name    scram
-%global		upstream_version 1.0.0-beta.2
+%global		upstream_version 2.1
 
 Name:		ongres-%upstream_name
 Version:	%(echo %upstream_version | sed 's/-/~/g')
-Release:	12%{?dist}
+Release:	1%{?dist}
 Summary:	Salted Challenge Response Authentication Mechanism (SCRAM) - Java Implementation
 License:	BSD
-URL:		https://github.com/ongres/%upstream_name
-Source0:	https://github.com/ongres/%upstream_name/archive/%upstream_version/%upstream_name-%upstream_version.tar.gz
+URL:           https://github.com/ongres/%upstream_name
+Source0:       https://github.com/ongres/%upstream_name/archive/%upstream_version/%upstream_name-%upstream_version.tar.gz
 BuildRequires:	maven-local
+BuildRequires:  findbugs
+BuildRequires:  ongres-stringprep
 BuildArch:	noarch
 
 %description
@@ -62,6 +64,9 @@ find \( -name '*.jar' -o -name '*.class' \) -delete
 %license LICENSE
 
 %changelog
+* Fri Feb 12 2021 Ondrej Dubaj <odubaj@redhat.com> - 2.1-1
+- Rebase to version 2.2
+
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.0~beta.2-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 
diff --git a/sources b/sources
index 8cd6a57..f4314e7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (scram-1.0.0-beta.2.tar.gz) = 85cfad335712e187c41343aa3029074596075e28fa037f6f0965a7b9062d23b807dfc0bd71fdd835babd89699705e9bcf0e1f7dad4bcfd685f0f96debc0fab6d
+SHA512 (scram-2.1.tar.gz) = e0757b306db03c56f03fa0907e46693337854c152a321cae1b109a1c16b0cb5be2482a92d64a420432a3ea31371990cbac444f965abde89c04083005b30012ef