diff --git a/.gitignore b/.gitignore
index c11b2c1..8ae8176 100644
--- a/.gitignore
+++ b/.gitignore
@@ -84,3 +84,4 @@
 /389-ds-base-1.3.1.14.tar.bz2
 /389-ds-base-1.3.1.15.tar.bz2
 /389-ds-base-1.3.1.16.tar.bz2
+/389-ds-base-1.3.1.17.tar.bz2
diff --git a/389-ds-base-git-local.sh b/389-ds-base-git-local.sh
index 5886630..94a01a3 100644
--- a/389-ds-base-git-local.sh
+++ b/389-ds-base-git-local.sh
@@ -2,7 +2,7 @@
 
 DATE=`date +%Y%m%d`
 # use a real tag name here
-VERSION=1.3.1.16
+VERSION=1.3.1.17
 PKGNAME=389-ds-base
 TAG=${TAG:-$PKGNAME-$VERSION}
 #SRCNAME=$PKGNAME-$VERSION-$DATE
diff --git a/389-ds-base-git.sh b/389-ds-base-git.sh
index 3de3bfa..ae1a7ff 100644
--- a/389-ds-base-git.sh
+++ b/389-ds-base-git.sh
@@ -2,7 +2,7 @@
 
 DATE=`date +%Y%m%d`
 # use a real tag name here
-VERSION=1.3.1.16
+VERSION=1.3.1.17
 PKGNAME=389-ds-base
 TAG=${TAG:-$PKGNAME-$VERSION}
 URL="http://git.fedorahosted.org/git/?p=389/ds.git;a=snapshot;h=$TAG;sf=tgz"
diff --git a/389-ds-base.spec b/389-ds-base.spec
index c8b1041..3c677ec 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.16
+Version:          1.3.1.17
 Release:          %{?relprefix}1%{?prerel}%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://port389.org/
@@ -314,6 +314,33 @@ fi
 %{_libdir}/%{pkgname}/libslapd.so.*
 
 %changelog
+* Wed Jan  8 2014 Noriko Hosoi <nhosoi@redhat.com> - 1.3.1.17-1
+- the 1.3.1.17 release
+- Ticket 342   - better error message when cache overflows (phase 2)
+- Ticket 447 - Possible to add invalid attribute to nsslapd-allowed-to-delete-attrs
+- Ticket 571 (dup 47361) - Empty control list causes LDAP protocol error is thrown
+- Ticket 47587 - hard coded limit of 64 masters in agreement and changelog code
+- Ticket 47591 - entries with empty objectclass attribute value can be hidden
+- Ticket 47592 - automember plugin task memory leaks
+- Ticket 47596 - attrcrypt fails to find unlocked key
+- Ticket 47599 - fix memory leak
+- Ticket 47606 - replica init/bulk import errors should be more verbose
+- Ticket 47611 - Add script to build patched RPMs
+- Ticket 47611 - Add make rpms build target
+- Ticket 47613 - Issues setting allowed mechanisms
+- Ticket 47613 - Impossible to configure nsslapd-allowed-sasl-mechanisms
+- Ticket 47614 - Possible to specify invalid SASL mechanism in nsslapd-allowed-sasl-mechanisms
+- Ticket 47620 - Fix missing left bracket
+- Ticket 47620 - Fix dereferenced NULL pointer in agmtlist_modify_callback()
+- Ticket 47620 - Fix logically dead code.
+- Ticket 47620 - Config value validation improvement
+- Ticket 47620 - Fix cherry-pick error for 1.3.2 and 1.3.1
+- Ticket 47620 - 389-ds rejects nsds5ReplicaProtocolTimeout attribute
+- Ticket 47622 - Automember betxnpreoperation - transaction not aborted when group entry does not exist
+- Ticket 47623 - fix memleak caused by 47347
+- Ticket 47627 - Fix replication logging
+- Ticket 47627 - changelog iteration should ignore cleaned rids when getting the minCSN
+
 * Fri Nov 22 2013 Rich Megginson <rmeggins@redhat.com> - 1.3.1.16-1
 - Ticket 47599 - Reduce lock scope in retro changelog plug-in
 -    Forgot to add definition of retrocl_cn_lock
diff --git a/sources b/sources
index e825fec..dd4ec9d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0ce9a6fc972ed7b341faa90541b70e07  389-ds-base-1.3.1.16.tar.bz2
+432e74424ed722cfca1e4b362452d046  389-ds-base-1.3.1.17.tar.bz2