diff --git a/.gitignore b/.gitignore
index 6cb6801..c8ed68e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,3 +41,4 @@
 /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
+/389-ds-base-1.2.11.a1.tar.bz2
diff --git a/389-ds-base-git-local.sh b/389-ds-base-git-local.sh
index 9406a4b..79579e6 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.4
+VERSION=1.2.11.a1
 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 e7a5581..7871336 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.4
+VERSION=1.2.11.a1
 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 7a496ae..baa260e 100644
--- a/389-ds-base.spec
+++ b/389-ds-base.spec
@@ -3,12 +3,12 @@
 # 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 .rc1
+%global prerel .a1
 # also need the relprefix field for a pre-release e.g. .0 - also comment out for official release
-# % global relprefix 0.
+%global relprefix 0.
 
 %global use_openldap 1
-%global use_db4 1
+%global use_db4 0
 # If perl-Socket-2.000 or newer is available, set 0 to use_Socket6.
 %global use_Socket6 0
 
@@ -21,8 +21,8 @@
 
 Summary:          389 Directory Server (base)
 Name:             389-ds-base
-Version:          1.2.10.4
-Release:          %{?relprefix}4%{?prerel}%{?dist}
+Version:          1.2.11
+Release:          %{?relprefix}1%{?prerel}%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://port389.org/
 Group:            System Environment/Daemons
@@ -309,6 +309,53 @@ fi
 %{_libdir}/%{pkgname}/libslapd.so.*
 
 %changelog
+* Fri Mar 30 2012 Rich Megginson <rmeggins@redhat.com> - 1.2.11-0.1.a1
+- 453eb97 schema def must have DESC '' - close paren must be preceded by space
+- Trac Ticket #46 - (additional) setup-ds-admin.pl does not like ipv6 only hostnames
+- Ticket #331 - transaction errors with db 4.3 and db 4.2
+- Ticket #261 - Add Solaris i386
+- Ticket #316 and Ticket #70 - add post add/mod and AD add callback hooks
+- Ticket #324 - Sync with group attribute containing () fails
+- Ticket #319 - ldap-agent crashes on start with signal SIGSEGV
+- 77cacd9 coverity 12606 Logically dead code
+- Trac Ticket #303 - make DNA range requests work with transactions
+- Ticket #320 - allow most plugins to be betxn plugins
+- Ticket #24 - Add nsTLS1 to the DS schema
+- Ticket #271 - Slow shutdown when you have 100+ replication agreements
+- TIcket #285 - compilation fixes for '--format-security'
+- Ticket 211 - Avoid preop range requests non-DNA operations
+- Ticket #271 - replication code cleanup
+- Ticket 317 - RHDS fractional replication with excluded password policy attributes leads to wrong error messages.
+- Ticket #308 - Automembership plugin fails if data and config area mixed in the plugin configuration
+- Ticket #292 - logconv.pl reporting unindexed search with different search base than shown in access logs
+- 6f8680a coverity 12563 Read from pointer after free (fix 2)
+- e6a9b22 coverity 12563 Read from pointer after free
+- 245d494 Config changes fail because of unknown attribute "internalModifiersname"
+- Ticket #191  - Implement SO_KEEPALIVE in network calls
+- Ticket #289 - allow betxn plugin config changes
+- 93adf5f destroy the entry cache and dn cache in the dse post op delete callback
+- e2532d8 init txn thread private data for all database modes
+- Ticket #291 - cannot use & in a sasl map search filter
+- 6bf6e79 Schema Reload crash fix
+- 60b2d12 Fixing compiler warnings
+- Trac Ticket #260 - 389 DS does not support multiple paging controls on a single connection
+- Ticket #302 - use thread local storage for internalModifiersName & internalCreatorsName
+- fdcc256 Minor bug fix introcuded by commit 69c9f3bf7dd9fe2cadd5eae0ab72ce218b78820e
+- Ticket #306 - void function cannot return value
+- ticket 181 - Allow PAM passthru plug-in to have multiple config entries
+- ticket 211 - Use of uninitialized variables in ldbm_back_modify()
+- Ticket #74 - Add schema for DNA plugin (RFE)
+- Ticket #301 - implement transaction support using thread local storage
+- Ticket #211 - dnaNextValue gets incremented even if the user addition fails
+- 144af59 coverity uninit var and resource leak
+- Trac Ticket #34 - remove-ds.pl does not remove everything
+- Trac Ticket #169 - allow 389 to use db5
+- bc78101 fix compiler warning in acct policy plugin
+- Trac Ticket #84 - 389 Directory Server Unnecessary Checkpoints
+- Trac Ticket #27 - SASL/PLAIN binds do not work
+- Ticket #129 - Should only update modifyTimestamp/modifiersName on MODIFYops
+- Ticket #17 - new replication optimizations
+
 * Tue Mar 27 2012 Noriko Hosoi <nhosoi@redhat.com> - 1.2.10.4-4
 - Ticket #46 - (revised) setup-ds-admin.pl does not like ipv6 only hostnames
 - Ticket #66 - 389-ds-base spec file does not have a BuildRequires on gcc-c++
diff --git a/sources b/sources
index 47e9fec..a611f9d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4cb3f8920fec09a368e0dc9b7c9f2fd2  389-ds-base-1.2.10.4.tar.bz2
+8c848bc002e529341868a9ae0b0ae5ee  389-ds-base-1.2.11.a1.tar.bz2