diff --git a/.gitignore b/.gitignore
index 6f85d19..618b969 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,3 +33,4 @@
 /389-ds-base-1.2.10.a4.tar.bz2
 /389-ds-base-1.2.10.a5.tar.bz2
 /389-ds-base-1.2.10.a6.tar.bz2
+/389-ds-base-1.2.10.a7.tar.bz2
diff --git a/389-ds-base-git-local.sh b/389-ds-base-git-local.sh
index 005fe27..1cf8a1f 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.a6
+VERSION=1.2.10.a7
 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 d8542f0..9e3d801 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.a6
+VERSION=1.2.10.a7
 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 e019fec..74f8e7a 100644
--- a/389-ds-base.spec
+++ b/389-ds-base.spec
@@ -3,7 +3,7 @@
 # for a pre-release, define the prerel field e.g. .a1 .rc2 - comment out for official release
 # also remove the space between % and global - this space is needed because
 # fedpkg verrel stupidly ignores comment lines
-%global prerel .a6
+%global prerel .a7
 # also need the relprefix field for a pre-release e.g. .0 - also comment out for official release
 %global relprefix 0.
 
@@ -19,7 +19,7 @@
 Summary:          389 Directory Server (base)
 Name:             389-ds-base
 Version:          1.2.10
-Release:          %{?relprefix}6%{?prerel}%{?dist}
+Release:          %{?relprefix}7%{?prerel}%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://port389.org/
 Group:            System Environment/Daemons
@@ -281,6 +281,29 @@ exit 0
 %{_libdir}/%{pkgname}/libslapd.so.*
 
 %changelog
+* Fri Jan 20 2012 Rich Megginson <rmeggins@redhat.com> - 1.2.10-0.7.a7
+- Ticket #262 - pid file not removed with systemd
+- Ticket #50 - server should not call a plugin after the plugin close function is called
+- Ticket #18 - Data inconsitency during replication
+- Ticket #49 - better handling for server shutdown while long running tasks are active
+- Ticket #15 - Get rid of rwlock.h/rwlock.c and just use slapi_rwlock instead
+- Ticket #257 - repl-monitor doesn't work if leftmost hostnames are the same
+- Ticket #12 - 389 DS DNA Plugin / Replication failing on GSSAPI
+- 6aaeb77 add a hack to disable sasl hostname canonicalization
+- Ticket 168 - minssf should not apply to rootdse
+- Ticket #177 - logconv.pl doesn't detect restarts
+- Ticket #159 - Managed Entry Plugin runs against managed entries upon any update without validating
+- Ticket 75 - Unconfigure plugin opperations are being called.
+- Ticket 26 - Please support setting defaultNamingContext in the rootdse.
+- Ticket #71 - unable to delete managed entry config
+- Ticket #167 - Mixing transaction and non-transaction plugins can cause deadlock
+- Ticket #256 - debug build assertion in ACL_EvalDestroy()
+- Ticket #4 - bak2db gets stuck in infinite loop
+- Ticket #162 - Infinite loop / spin inside strcmpi_fast, acl_read_access_allowed_on_attr, server DoS
+- Ticket #3: acl cache overflown problem
+- Ticket 1 - pre-normalize filter and pre-compile substring regex - and other optimizations
+- Ticket 2 - If node entries are tombstone'd, subordinate entries fail to get the full DN.
+
 * Thu Dec 15 2011 Rich Megginson <rmeggins@redhat.com> - 1.2.10-0.6.a6
 - Bug 755725 - 389 programs linked against openldap crash during shutdown
 - Bug 755754 - Unable to start dirsrv service using systemd
diff --git a/sources b/sources
index 845a6b6..025aaaa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-71be00a2efd98d4fd138de0a128e9ed4  389-ds-base-1.2.10.a6.tar.bz2
+162736c08297f42bfbf89424c168f342  389-ds-base-1.2.10.a7.tar.bz2