diff --git a/.gitignore b/.gitignore
index f3704e2..6cb6801 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,3 +40,4 @@
 /389-ds-base-1.2.10.1.tar.bz2
 /389-ds-base-1.2.10.2.tar.bz2
 /389-ds-base-1.2.10.3.tar.bz2
+/389-ds-base-1.2.10.4.tar.bz2
diff --git a/389-ds-base-git-local.sh b/389-ds-base-git-local.sh
index 7b4bce2..9406a4b 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.10.3
+VERSION=1.2.10.4
 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 90b93f0..e7a5581 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.10.3
+VERSION=1.2.10.4
 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 d10d393..e36051a 100644
--- a/389-ds-base.spec
+++ b/389-ds-base.spec
@@ -19,7 +19,7 @@
 
 Summary:          389 Directory Server (base)
 Name:             389-ds-base
-Version:          1.2.10.3
+Version:          1.2.10.4
 Release:          %{?relprefix}1%{?prerel}%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://port389.org/
@@ -298,6 +298,9 @@ exit 0
 %{_libdir}/%{pkgname}/libslapd.so.*
 
 %changelog
+* Tue Mar 13 2012 Rich Megginson <rmeggins@redhat.com> - 1.2.10.4-1
+- Ticket #305 - Certain CMP operations hang or cause ns-slapd to crash
+
 * Mon Mar  5 2012 Rich Megginson <rmeggins@redhat.com> - 1.2.10.3-1
 - b05139b memleak in normalize_mods2bvals
 - c0eea24 memleak in mep_parse_config_entry
diff --git a/sources b/sources
index d31421c..47e9fec 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7c9c6cc2ef523980e816724215698fa6  389-ds-base-1.2.10.3.tar.bz2
+4cb3f8920fec09a368e0dc9b7c9f2fd2  389-ds-base-1.2.10.4.tar.bz2