diff --git a/.cvsignore b/.cvsignore
index 7a8bc93..de018c1 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
 389-ds-base-1.2.3.tar.bz2
+389-ds-base-1.2.4.tar.bz2
diff --git a/389-ds-base-git-local.sh b/389-ds-base-git-local.sh
index 31147ec..b246dd4 100644
--- a/389-ds-base-git-local.sh
+++ b/389-ds-base-git-local.sh
@@ -2,14 +2,18 @@
 
 DATE=`date +%Y%m%d`
 # use a real tag name here
-TAG=389-ds-base-1.2.3
-VERSION=1.2.3
+VERSION=1.2.4
 PKGNAME=389-ds-base
+TAG=$PKGNAME-$VERSION
 #SRCNAME=$PKGNAME-$VERSION-$DATE
 SRCNAME=$PKGNAME-$VERSION
 
 echo you must be in the ds git repo to use this
-git status > /dev/null || echo bye
+test -d .git || {
+    echo bye
+    exit 1
+}
+
 if [ -z "$1" ] ; then
 	dir=.
 else
diff --git a/389-ds-base-git.sh b/389-ds-base-git.sh
index 21f3ee2..262f2a2 100644
--- a/389-ds-base-git.sh
+++ b/389-ds-base-git.sh
@@ -2,10 +2,10 @@
 
 DATE=`date +%Y%m%d`
 # use a real tag name here
-TAG=389-ds-base-1.2.1
-VERSION=1.2.1
+VERSION=1.2.4
 PKGNAME=389-ds-base
-export CVSROOT=:pserver:anonymous@cvs.fedoraproject.org:/cvs/dirsec
+TAG=$PKGNAME-$VERSION
+#export CVSROOT=:pserver:anonymous@cvs.fedoraproject.org:/cvs/dirsec
 #SRCNAME=$PKGNAME-$VERSION-$DATE
 SRCNAME=$PKGNAME-$VERSION
 
diff --git a/389-ds-base.spec b/389-ds-base.spec
index 43595e2..e24dbd9 100644
--- a/389-ds-base.spec
+++ b/389-ds-base.spec
@@ -3,7 +3,7 @@
 
 Summary:          389 Directory Server (base)
 Name:             389-ds-base
-Version:          1.2.3
+Version:          1.2.4
 Release:          1%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://port389.org/
@@ -265,6 +265,11 @@ end
 %{_libdir}/%{pkgname}/*.so
 
 %changelog
+* Thu Oct 29 2009 Rich Megginson <rmeggins@redhat.com> - 1.2.4-1
+- 1.2.4 release
+- resolves bug 221905 - added support for Salted MD5 (SMD5) passwords - primarily for migration
+- resolves bug 529258 - Make upgrade remove obsolete schema from 99user.ldif
+
 * Mon Sep 14 2009 Rich Megginson <rmeggins@redhat.com> - 1.2.3-1
 - 1.2.3 release
 - added template-initconfig to %files
diff --git a/sources b/sources
index a02d4dc..6234284 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 1a21a7490d71a585025af657ee133790  389-ds-base-1.2.3.tar.bz2
+291f1fb511419beb8ea4e04d0065e8f7  389-ds-base-1.2.4.tar.bz2