diff --git a/.gitignore b/.gitignore
index 378193a..c7167f2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -59,3 +59,4 @@
 /389-ds-base-1.2.11.15.tar.bz2
 /389-ds-base-1.2.11.16.tar.bz2
 /389-ds-base-1.2.11.17.tar.bz2
+/389-ds-base-1.2.11.18.tar.bz2
diff --git a/389-ds-base-git-local.sh b/389-ds-base-git-local.sh
index f633dce..b528817 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.17
+VERSION=1.2.11.18
 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 110ac14..9526db3 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.17
+VERSION=1.2.11.18
 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 68bcf4b..fe3734c 100644
--- a/389-ds-base.spec
+++ b/389-ds-base.spec
@@ -21,7 +21,7 @@
 
 Summary:          389 Directory Server (base)
 Name:             389-ds-base
-Version:          1.2.11.17
+Version:          1.2.11.18
 Release:          %{?relprefix}1%{?prerel}%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://port389.org/
@@ -311,6 +311,35 @@ fi
 %{_libdir}/%{pkgname}/libslapd.so.*
 
 %changelog
+* Thu Jan 24 2013 Mark Reynolds <mreynolds@redhat.com> - 1.2.11.18-1
+12420d9 bump version to 1.2.11.18
+Ticket 556 - Don't overwrite certmap.conf during upgrade
+Ticket 495 - 1.2.11 - plugin dn is missing from pblock
+Ticket 549 - DNA plugin no longer reports additional info when range is depleted
+Ticket 541 - need to set plugin as off in ldif template
+Ticket 541 - RootDN Access Control plugin is missing after upgrade
+Ticket 527 - ns-slapd segfaults if it cannot rename the logs
+39b0938 Coverity Issues for 1.2.11
+Ticket 216 - disable replication agreements
+Ticket 20 - Allow automember to work on entries that have already been added
+7d22bc2 Coverity Fixes
+Ticket 337 - improve CLEANRUV functionality
+Ticket 495 - internalModifiersname not updated by DNA plugin
+Ticket 517 - crash in DNA if no dnaMagicRegen is specified
+Trac Ticket #520 - RedHat Directory Server crashes (segfaults) when moving ldap entry
+Trac Ticket #519 - Search with a complex filter including range search is slow
+Trac Ticket #500 - Newly created users with organizationalPerson objectClass fails to sync from AD to DS with missing attribute error
+Ticket #503 - Improve AD version in winsync log message
+Trac Ticket #498 - Cannot abaondon simple paged result search
+55997a6 Coverity defects
+Trac Ticket #494 - slapd entered to infinite loop during new index addition
+56ebbb2 Fixing compiler warnings in the posix-winsync plugin
+a57d913 Coverity defects
+Ticket 468 - if pam_passthru is enabled, need to AC_CHECK_HEADERS([security/pam_appl.h])
+Ticket 486 - nsslapd-enablePlugin should not be multivalued
+Ticket 488 - Doc: DS error log messages with typo
+Ticket #491 - multimaster_extop_cleanruv returns wrong error codes
+
 * Mon Dec 10 2012 Mark Reynolds <mreynolds@redhat.com> - 1.2.11.17-1
 - 94d5ea3 bump verison to 1.2.11.17
 - Ticket 527 - ns-slapd segfaults if it cannot rename the logs
diff --git a/sources b/sources
index 45f8513..c7ffc24 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e3cbf8674b0b8c06d71468d56784de1c  389-ds-base-1.2.11.17.tar.bz2
+47da47da0644316d224eab1f45808383  389-ds-base-1.2.11.18.tar.bz2