diff --git a/.gitignore b/.gitignore
index 9d985db..2937d8f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,3 +30,7 @@
 /Add-a-fail-no-debug-info-to-abidiff.patch
 /libabigail-1.6.tar.gz
 /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 9dfac47..46e5edc 100644
--- a/libabigail.spec
+++ b/libabigail.spec
@@ -2,11 +2,11 @@
 %global tarball_name %{name}-%{version}
 
 Name: libabigail
-Version: 1.7
-Release: 2%{?dist}
+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
 
@@ -21,6 +21,7 @@ BuildRequires: dos2unix
 BuildRequires: dpkg
 BuildRequires: wget
 BuildRequires: koji
+BuildRequires: python3-koji
 
 %description
 The libabigail package comprises seven command line utilities:
@@ -89,7 +90,8 @@ them manually.
 %setup -n %{tarball_name}
 
 %build
-%configure --disable-silent-rules --disable-zip-archive --disable-static 
+%configure --disable-silent-rules --disable-zip-archive --disable-static
+
 make %{?_smp_mflags}
 pushd doc
 make html-doc
@@ -115,7 +117,7 @@ pathfix.py -i %{__python3} -pn %{buildroot}%{_bindir}/fedabipkgdiff
 %endif
 
 %check
-time make %{?_smp_mflags} check || (cat tests/test-suite.log && exit 2)
+time make %{?_smp_mflags} check check-self-compare || (cat tests/test-suite.log && exit 2)
 
 if test $? -ne 0; then
   cat tests/tests-suite.log
@@ -134,7 +136,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*
@@ -146,7 +148,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}
@@ -155,6 +157,42 @@ 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 updated license change.
+
+* Thu Feb 25 2021 Dodji Seketeli <dodji@redhat.com> - 1.8.2-1
+- Update to upstream 1.8.2 point release
+
+* Wed Jan 27 2021 Dodji Seketeli <dodji@redhat.com> - 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:
+      ir: Add better comments to types_have_similar_structure
+      mainpage: Update web page for 1.8 release
+      Bug 26992 - Try harder to resolve declaration-only classes
+      Bug 27204 -  potential loss of some aliased ELF function symbols
+      Ignore duplicated functions and those not associated with ELF symbols
+      Bug 27236 - Pointer comparison wrongly fails because of typedef change
+      Bug 27233 - fedabipkgdiff fails on package gnupg2 from Fedora 33
+      Bug 27232 - fedabipkgdiff fails on gawk from Fedora 33
+      dwarf-reader: Support fast DW_FORM_line_strp string comparison
+      gen-changelog.py: Update call to subprocess.Popen & cleanup
+      Bug 27255 - fedabipkgdiff fails on nfs-utils on Fedora 33
+      abidiff: support --dump-diff-tree with --leaf-changes-only
+      ir: Arrays are indirect types for type structure similarity purposes
+      Add qualifier / typedef / array / pointer test
+      abg-ir: Optimize calls to std::string::find() for a single char.
+      abipkgdiff: Address operator precedence warning
+
+* Wed Jan  6 2021 Dodji Seketeli <dodji@redhat.com> - 1.8-2
+- Enable fedabipkgdiff back as the builders instability seems to have disappeared
+
+* Tue Dec  1 2020 Dodji Seketeli <dodji@redhat.com> - 1.8-1
+- Update to upstream 1.8
+- Add "make check-self-update" as a regression tests target.
+- Remove fedabipkgdiff as for a reason, koji python module is not
+  getting detected by configure on some arches of f33.
+
 * Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 
diff --git a/sources b/sources
index cf5681d..6928e6d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libabigail-1.7.tar.gz) = 02971c8f760cd7c6e7f77ef323c93769270666652a8f491b30cce74aa9bc20e2c5113eca0a534b814e9c8567538b6b7b84d15687e0ac15cf8ece736b2f7e2261
+SHA512 (libabigail-2.0.tar.gz) = 288f63f3495f0cd38258c50b78f30a573e43ab60494fefa22c8cba6d6776c5f94742ffea26297a232b78d25f6804f1b3f51febd59ec487733e6ef683cef2c180