diff --git a/.gitignore b/.gitignore
index 1f5675f..90d9c99 100644
--- a/.gitignore
+++ b/.gitignore
@@ -88,3 +88,4 @@
 /389-ds-base-1.3.1.18.tar.bz2
 /389-ds-base-1.3.1.19.tar.bz2
 /389-ds-base-1.3.1.20.tar.bz2
+/389-ds-base-1.3.1.21.tar.bz2
diff --git a/389-ds-base.spec b/389-ds-base.spec
index 0d6671a..3420ddd 100644
--- a/389-ds-base.spec
+++ b/389-ds-base.spec
@@ -24,7 +24,7 @@
 
 Summary:          389 Directory Server (base)
 Name:             389-ds-base
-Version:          1.3.1.20
+Version:          1.3.1.21
 Release:          %{?relprefix}1%{?prerel}%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://port389.org/
@@ -315,6 +315,19 @@ fi
 %{_libdir}/%{pkgname}/libns-dshttpd.so*
 
 %changelog
+* Thu Mar 13 2014 Noriko Hosoi <nhosoi@redhat.com> - 1.3.1.21-1
+- bump version to 1.3.1.21
+- Ticket 47735 - e_uniqueid fails to set if an entry is a conflict entry
+- Ticket 47740 - Coverity issue in 1.3.3
+- Ticket 47740 - Fix coverity issues - Part 5
+- Ticket 47740 - Fix coverity erorrs - Part 4
+- Ticket 47640 - Fix coverity issues - part 3
+- Ticket 47538 - RFE: repl-monitor.pl plain text output, cmdline config options
+- Ticket 47740 - Coverity Fixes (Mark - part 1)
+- Ticket 47734 - Change made in resolving ticket #346 fails on Debian SPARC64
+- Ticket 47722 - Fixed filter not correctly identified
+- Ticket 47722 - rsearch filter error on any search filter
+
 * Mon Mar 10 2014 Noriko Hosoi <nhosoi@redhat.com> - 1.3.1.20-1
 - bump version to 1.3.1.20
 - Ticket 47739 - directory server is insecurely misinterpreting authzid on a SASL/GSSAPI bind
diff --git a/sources b/sources
index d36716c..1e1dc7e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-88a4816a87b757dc43af1d32ac280a28  389-ds-base-1.3.1.20.tar.bz2
+b7d783ca4e38ae945283e440653dc2c9  389-ds-base-1.3.1.21.tar.bz2