diff --git a/.gitignore b/.gitignore
index b272f37..a06b6cf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -201,3 +201,4 @@
 /389-ds-base-2.0.1.tar.bz2
 /389-ds-base-2.0.2.tar.bz2
 /389-ds-base-2.0.3.tar.bz2
+/389-ds-base-2.0.4.tar.bz2
diff --git a/389-ds-base.spec b/389-ds-base.spec
index c353fa7..9aa862b 100644
--- a/389-ds-base.spec
+++ b/389-ds-base.spec
@@ -46,8 +46,8 @@ ExcludeArch: i686
 
 Summary:          389 Directory Server (base)
 Name:             389-ds-base
-Version:          2.0.3
-Release:          %{?relprefix}3%{?prerel}%{?dist}.1
+Version:          2.0.4
+Release:          %{?relprefix}1%{?prerel}%{?dist}
 License:          GPLv3+
 URL:              https://www.port389.org
 Conflicts:        selinux-policy-base < 3.9.8
@@ -614,6 +614,46 @@ exit 0
 %endif
 
 %changelog
+* Thu Apr 08 2021 Thierry Bordaz <tbordaz@redhat.com> - 2.0.4-1
+- Bump version to 2.0.4
+- Issue 4680 - 389ds coredump (@389ds/389-ds-base-nightly) in replica install with CA (#4715)
+- Issue 3965 - RFE - Implement the Password Policy attribute "pwdReset" (#4713)
+- Issue 4700 - Regression in winsync replication agreement (#4712)
+- Issue 3965 - RFE - Implement the Password Policy attribute "pwdReset" (#4710)
+- Issue 4169 - UI - migrate monitor tables to PF4
+- issue 4585 - backend redesign phase 3c - dbregion test removal (#4665)
+- Issue 2736 - remove remaining perl references
+- Issue 2736 - https://github.com/389ds/389-ds-base/issues/2736
+- Issue 4706 - negative wtime in access log for CMP operations
+- Issue 3585 - LDAP server returning controltype in different sequence
+- Issue 4127 - With Accounts/Account module delete fuction is not working (#4697)
+- Issue 4666 - BUG - cb_ping_farm can fail with anonymous binds disabled (#4669)
+- Issue 4671 - UI - Fix browser crashes
+- Issue 4169 - UI - Add PF4 charts for server stats
+- Issue 4648 - Fix some issues and improvement around CI tests (#4651)
+- Issue  4654  Updates to tickets/ticket48234_test.py  (#4654)
+- Issue 4229 - Fix Rust linking
+- Issue 4673 - Update Rust crates
+- Issue 4658 - monitor - connection start date is incorrect
+- Issue 4169 - UI - migrate modals to PF4
+- Issue 4656 - remove problematic language from ds-replcheck
+- Issue 4459 - lib389 - Default paths should use dse.ldif if the server is down
+- Issue 4656 - Remove problematic language from UI/CLI/lib389
+- Issue 4661 - RFE - allow importing openldap schemas (#4662)
+- Issue 4659 - restart after openldap migration to enable plugins (#4660)
+- Merge pull request #4664 from mreynolds389/issue4663
+- issue 4552 - Backup Redesign phase 3b - use dbimpl in replicatin plugin (#4622)
+- Issue 4643 - Add a tool that generates Rust dependencies for a specfile (#4645)
+- Issue 4646 - CLI/UI - revise DNA plugin management
+- Issue 4644 - Large updates can reset the CLcache to the beginning of the changelog (#4647)
+- Issue 4649 - crash in sync_repl when a MODRDN create a cenotaph (#4652)
+- Issue 4169 - UI - Migrate alerts to PF4
+- Issue 4169 - UI - Migrate Accordians to PF4 ExpandableSection
+- Issue 4595 - Paged search lookthroughlimit bug (#4602)
+- Issue 4169 - UI - port charts to PF4
+- Issue 2820 - Fix CI test suite issues
+- Issue 4513 - CI - make acl ip address tests more robust
+
 * Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 2.0.3-3.1
 - Rebuilt for updated systemd-rpm-macros
   See https://pagure.io/fesco/issue/2583.
diff --git a/sources b/sources
index 64df1ed..a7c9b26 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (389-ds-base-2.0.3.tar.bz2) = 48f0dcd7e4853646ea9bb38ec742f2b421b7bd6477d33070a8c97a764021ab7fa6fc005cb75ea87860b7b70998dc4df87790cf1c2bda3e6c0a9f08d39b00f6d2
 SHA512 (jemalloc-5.2.1.tar.bz2) = 0bbb77564d767cef0c6fe1b97b705d368ddb360d55596945aea8c3ba5889fbce10479d85ad492c91d987caacdbbdccc706aa3688e321460069f00c05814fae02
+SHA512 (389-ds-base-2.0.4.tar.bz2) = accf7bbcd36c2ff52cca6f4ab3a58b5842938766981ff321b03d2e6adaab9c328253bee5b57cd9f43d0f047aca50f9aea880508ae4ca5d836c65ba7dc67b142a