diff --git a/.gitignore b/.gitignore
index fd4aa58..2937d8f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,3 +32,5 @@
 /libabigail-1.7.tar.gz
 /libabigail-1.8.tar.gz
 /libabigail-1.8.1.tar.gz
+/libabigail-1.8.2.tar.gz
+/libabigail-2.0.tar.gz
diff --git a/libabigail.spec b/libabigail.spec
index 2690fe8..6cb5a09 100644
--- a/libabigail.spec
+++ b/libabigail.spec
@@ -2,20 +2,13 @@
 %global tarball_name %{name}-%{version}
 
 Name: libabigail
-Version: 1.8.1
+Version: 2.0
 Release: 1%{?dist}
 Summary: Set of ABI analysis tools
 
-License: LGPLv3+
+License: ASL 2.0
 URL: https://sourceware.org/libabigail/
 Source0: http://mirrors.kernel.org/sourceware/libabigail/%{tarball_name}.tar.gz
-# The tarball is built from the content of the git repository by doing:
-# git clone git://sourceware.org/git/libabigail.git --branch libabigail-1.8
-# cd libabigail
-# git checkout lbiabigail-1.8.1
-# autoreconf -i
-# configure
-# make dist
 
 BuildRequires: gcc-c++
 BuildRequires: libtool
@@ -25,10 +18,12 @@ BuildRequires: doxygen
 BuildRequires: python3-sphinx
 BuildRequires: texinfo
 BuildRequires: dos2unix
+%if 0%{?fedora}
 BuildRequires: dpkg
-BuildRequires: wget
 BuildRequires: koji
 BuildRequires: python3-koji
+%endif
+BuildRequires: wget
 
 %description
 The libabigail package comprises seven command line utilities:
@@ -143,7 +138,7 @@ fi
 %{_libdir}/libabigail.so.0.0.0
 %{_libdir}/libabigail/default.abignore
 %doc README AUTHORS ChangeLog
-%license COPYING COPYING-LGPLV3 COPYING-GPLV3
+%license LICENSE.txt license-change-2020.txt
 %{_mandir}/man1/*
 %{_mandir}/man7/*
 %{_infodir}/abigail.info*
@@ -155,7 +150,7 @@ fi
 %{_datadir}/aclocal/abigail.m4
 
 %files doc
-%license COPYING  COPYING-LGPLV3 COPYING-GPLV3
+%license LICENSE.txt license-change-2020.txt
 %doc doc/manuals/html/*
 
 %if 0%{?fedora}
@@ -164,6 +159,14 @@ fi
 %endif
 
 %changelog
+* Mon Oct  4 2021 Dodji Seketeli <dodji@redhat.com> - 2.0-1
+- Update to upstream 2.0 tarball
+- Change License to ASL 2.0 to comply with the upstream license change.
+
+* Thu Feb 25 2021 Dodji Seketeli <dodji@redhat.com> - 1.8.2-1
+- Update to upstream 1.8.2 point release
+- Require dpkg and koji only on Fedora builds
+
 * Wed Jan 27 2021 Dodji Seketeli <dodji@seketeli.org> - 1.8.1-1
 - Update to upstream fixes up to libabigail-1.8.1
   This encompasses this fixes, compared to the last 1.8 release:
diff --git a/sources b/sources
index f444193..6928e6d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libabigail-1.8.1.tar.gz) = 9039f614bc14680ae30e26e2f7af296aa7ebcec1c3bb7f27c414e21e338b7081ff46602e65b5201528869c0222f203553666e65a0ab5229e54556ac59d2030ef
+SHA512 (libabigail-2.0.tar.gz) = 288f63f3495f0cd38258c50b78f30a573e43ab60494fefa22c8cba6d6776c5f94742ffea26297a232b78d25f6804f1b3f51febd59ec487733e6ef683cef2c180