diff --git a/.gitignore b/.gitignore
index 88486c3..69d133c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -203,3 +203,4 @@
 /389-ds-base-2.0.3.tar.bz2
 /rust-openssl-770ba32702abd2b4cab80727958c27ac3043c3ec.tar.gz
 /389-ds-base-2.0.5.tar.bz2
+/389-ds-base-2.0.6.tar.bz2
diff --git a/389-ds-base.spec b/389-ds-base.spec
index 1433246..fb5273c 100644
--- a/389-ds-base.spec
+++ b/389-ds-base.spec
@@ -32,7 +32,7 @@ ExcludeArch: i686
 %global use_clang 0
 
 # Build cockpit plugin
-%global use_cockpit 1
+%global use_cockpit 0
 
 # fedora 15 and later uses tmpfiles.d
 # otherwise, comment this out
@@ -46,8 +46,8 @@ ExcludeArch: i686
 
 Summary:          389 Directory Server (base)
 Name:             389-ds-base
-Version:          2.0.5
-Release:          %{?relprefix}1%{?prerel}%{?dist}.1
+Version:          2.0.6
+Release:          %{?relprefix}1%{?prerel}%{?dist}
 License:          GPLv3+ and ASL 2.0 and MPLv2.0 and Boost
 URL:              https://www.port389.org
 Conflicts:        selinux-policy-base < 3.9.8
@@ -712,6 +712,19 @@ exit 0
 %endif
 
 %changelog
+* Thu Jun 24 2021 Mark Reynolds <mreynolds@redhat.com> - 2.0.6-1
+- Bump version to 2.0.6
+- Resolves: Bug 1970559 - Crash in dynamic_plugins_test.py::test_acceptance
+- Resolves: Bug 1843522 - move CL followup (1) - don't use hardcoded filename
+- Resolves: Bug 1843524 - move CL followup (3) - import ldif2cl task should not close all changelogs
+- Resolves: Bug 220222 - [RFE] support for RFC 4530 entryUUID attribute
+- Resolves: Bug 1859296 - Remove DES to AES conversion code
+- Resolves: Bug 1970586 - MODRDN fails with err=32 in managed_entry_test.py::test_mentry01
+- Resolves: Bug 1970613 - dbscan crashes with SIGABRT in dirsrvtests/tests/suites/password/regression_test.py::test_unhashed_pw_switch
+- Resolves: Bug 1970620 - memberofAutoAddOC attribute can't be added to Memberof plugin when dynamic plugins are on
+- Resolves: Bug 1970586 - MODRDN fails with err=32 in managed_entry_test.py::test_mentry01
+- Resolves: Bug 1910941 - CVE-2020-35518 389-ds-base: information disclosure during the binding of a DN
+
 * Wed Jun 16 2021 Mohan Boddu <mboddu@redhat.com> - 2.0.5-1.1
 - Rebuilt for RHEL 9 BETA for openssl 3.0
   Related: rhbz#1971065
diff --git a/sources b/sources
index ead5764..8d4763f 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
-SHA512 (389-ds-base-2.0.5.tar.bz2) = 37f9cdcf26cfe4ba861917f50cca1bfc4f709c19da7895cdef8c68a54b617cdc0884577c2dd6c3fb233cd69341e2c7f9a77f1b3f0498f36a6c476e346123cc8a
+SHA512 (389-ds-base-2.0.6.tar.bz2) = 3a988207d1883e06c447d61906aa6a39eba229f77d7c6d6e0767fdc81b3c53256d829817d18b06e58460a0ea5ec1bf4e915a2b6aded3bdea23831ff767e31cf8
 SHA512 (jemalloc-5.2.1.tar.bz2) = 0bbb77564d767cef0c6fe1b97b705d368ddb360d55596945aea8c3ba5889fbce10479d85ad492c91d987caacdbbdccc706aa3688e321460069f00c05814fae02
-SHA512 (rust-openssl-770ba32702abd2b4cab80727958c27ac3043c3ec.tar.gz) = 82888c18beafae8cd8122fe91d00fd32c60ab1ed47db4da691ca762b5102eee4cbfcd6f333fcb1769ba1b65b655f726050b1deccdfdf7ec7b21728c51cd2c750