diff --git a/.gitignore b/.gitignore
index 8e90b43..0bfbb7f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
 /mosquitto-1.*.tar.gz
+/mosquitto-2.0.0.tar.gz
+/mosquitto-2.0.2.tar.gz
diff --git a/mosquitto.spec b/mosquitto.spec
index c0579e3..30baca8 100644
--- a/mosquitto.spec
+++ b/mosquitto.spec
@@ -1,9 +1,9 @@
 Name:           mosquitto
-Version:        1.6.12
-Release:        5%{?dist}
+Version:        2.0.2
+Release:        1%{?dist}
 Summary:        Open Source MQTT v3.1/v3.1.1 Broker
 
-License:        BSD
+License:        EPL-2.0
 URL:            http://mosquitto.org/
 Source0:        http://mosquitto.org/files/source/%{name}-%{version}.tar.gz
 
@@ -13,6 +13,7 @@ BuildRequires:  libuuid-devel
 BuildRequires:  libwebsockets-devel
 BuildRequires:  openssl-devel
 BuildRequires:  systemd-devel
+BuildRequires:  cjson-devel
 %if 0%{?rhel} == 7
 BuildRequires:  tcp_wrappers-libs
 %endif
@@ -37,7 +38,7 @@ Requires:     %{name}%{?_isa} = %{version}-%{release}
 Summary:      Development files for %{name}
 
 %description devel
-Development headers and libraries for %{name}
+Development headers and libraries for %{name}.
 
 %prep
 %autosetup -p1
@@ -64,6 +65,7 @@ export LIB_SUFFIX=64
 mkdir -p %{buildroot}%{_unitdir}
 install -p -m 0644 service/systemd/%{name}.service.notify %{buildroot}%{_unitdir}/%{name}.service
 mv %{buildroot}%{_sysconfdir}/%{name}/%{name}.conf.example %{buildroot}%{_sysconfdir}/%{name}/%{name}.conf
+mv %{buildroot}/usr/lib/*.so %{buildroot}%{_libdir}/
 
 %check
 #make test
@@ -88,7 +90,7 @@ exit 0
 
 %files
 %license LICENSE.txt 
-%doc ChangeLog.txt CONTRIBUTING.md readme.md
+%doc ChangeLog.txt CONTRIBUTING.md README.md
 %{_bindir}/*
 %{_sbindir}/*
 %{_libdir}/*.so.*
@@ -108,6 +110,13 @@ exit 0
 %{_mandir}/man3/*.3.*
 
 %changelog
+* Wed Dec 16 2020 Fabian Affolter <mail@fabian-affolter.ch> - 2.0.2-1
+- Update to new upstream release 2.0.2
+
+* Fri Dec 04 2020 Fabian Affolter <mail@fabian-affolter.ch> - 2.0.0-1
+- Update license 
+- Update to new upstream version 2.0.0
+
 * Wed Dec 02 2020 Fabian Affolter <mail@fabian-affolter.ch> - 1.6.12-5
 - Rebuilt
 
diff --git a/sources b/sources
index 41e24c5..ec1f6f8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mosquitto-1.6.12.tar.gz) = 68cd2e4aa14254c0332ad78eac1f885e0e4e9f2332540d3778b8c7df096db7618b8467b5bb25f70ddc3306d01dd36eb9a9e2bf2738da77e196c7a1ccaed869d2
+SHA512 (mosquitto-2.0.2.tar.gz) = 14ad40991c25b47b4bab4d14e8878cf4b31291cad8839a19f114da7dbaaea420a09837801cd24a37d20d14721787cc84dffe8091cc69add8ec556740745ebe2c