diff --git a/389-ds-base-git-local.sh b/389-ds-base-git-local.sh
index 9df807e..c6f9693 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.2.11.23
+VERSION=1.2.11.25
 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 dcdc643..e13743f 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.2.11.23
+VERSION=1.2.11.25
 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 f0aeaa1..dc02284 100644
--- a/389-ds-base.spec
+++ b/389-ds-base.spec
@@ -20,8 +20,8 @@
 
 Summary:          389 Directory Server (base)
 Name:             389-ds-base
-Version:          1.2.11.23
-Release:          %{?relprefix}3.1%{?prerel}%{?dist}
+Version:          1.2.11.25
+Release:          %{?relprefix}1%{?prerel}%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://port389.org/
 Group:            System Environment/Daemons
@@ -296,6 +296,23 @@ fi
 %{_libdir}/%{pkgname}/libslapd.so.*
 
 %changelog
+* Thu Nov 21 2013 Rich Megginson <rmeggins@redhat.com> - 1.2.11.25-1
+- Ticket #47605 CVE-2013-4485: DoS due to improper handling of ger attr searches
+- Ticket #47596 attrcrypt fails to find unlocked key
+- Revert "Ticket #47559 hung server - related to sasl and initialize"
+- Ticket #47585 Replication Failures related to skipped entries due to cleaned rids
+- Ticket #47581 - Winsync plugin segfault during incremental backoff (phase 2)
+- Ticket #47581 - Winsync plugin segfault during incremental backoff
+- Ticket 47577 - crash when removing entries from cache
+- Ticket #47559 hung server - related to sasl and initialize
+- fe52f44 ticket #47550 wip
+- Ticket #47550 logconv: failed logins: Use of uninitialized value in numeric comparison at logconv.pl line 949
+- Ticket #47551 logconv: -V does not produce unindexed search report
+- Ticket 47517 - fix memory leak in ldbm_delete.c
+- Ticket #47488 - Users from AD sub OU does not sync to IPA
+- minor fixes for bdb 4.2/4.3 and mozldap
+- Tickets: 47510 & 47543 - 389 fails to build when using Mozldap
+
 * Tue Oct 15 2013 Rich Megginson <rmeggins@redhat.com> - 1.2.11.23-3.1
 - add mutex around ldap ssl functions/bind/unbind