diff --git a/.gitignore b/.gitignore
index 1493549..f04b027 100644
--- a/.gitignore
+++ b/.gitignore
@@ -107,3 +107,4 @@
 /389-ds-base-1.3.3.2.tar.bz2
 /389-ds-base-1.3.3.3.tar.bz2
 /389-ds-base-1.3.3.4.tar.bz2
+/389-ds-base-1.3.3.5.tar.bz2
diff --git a/389-ds-base.spec b/389-ds-base.spec
index 76eec28..2882bf6 100644
--- a/389-ds-base.spec
+++ b/389-ds-base.spec
@@ -24,7 +24,7 @@
 
 Summary:          389 Directory Server (base)
 Name:             389-ds-base
-Version:          1.3.3.4
+Version:          1.3.3.5
 Release:          %{?relprefix}1%{?prerel}%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://port389.org/
@@ -32,6 +32,7 @@ Group:            System Environment/Daemons
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes:        %{name}-selinux
 Conflicts:        selinux-policy-base < 3.9.8
+Conflicts:        freeipa-server < 4.0.3
 Requires:         %{name}-libs = %{version}-%{release}
 Provides:         ldif2ldbm 
 
@@ -308,6 +309,21 @@ fi
 %{_libdir}/%{pkgname}/libns-dshttpd.so*
 
 %changelog
+* Fri Oct 10 2014 Noriko Hosoi <nhosoi@redhat.com> - 1.3.3.5-1
+- Release 1.3.3.5
+- Ticket 47914 - Add FreeIPA Conflicts to 389 spec file
+- Ticket 47922 - dynamically added macro aci is not evaluated on the fly
+- Ticket 47897 - Need to move slapi_pblock_set(pb, SLAPI_MODRDN_EXISTING_ENTRY, original_entry->ep_entry) prior to original_entry overwritten
+- Ticket 47920 - Encoding of SearchResultEntry is missing tag
+- Ticket 47912 - Proper handling of "No original_tombstone for changenumber" errors
+- Ticket 47899 - Fix slapi_td_plugin_lock_init prototype
+- Ticket 47919 - ldbm_back_modify SLAPI_PLUGIN_BE_PRE_MODIFY_FN does not return even if one of the preop plugins fails.
+- Ticket 47892 - Fix remaining compiler warnings
+- ticket 47916 - plugin logging parameter only triggers result logging
+- Ticket 47918 - result of dna_dn_is_shared_config is incorrectly used
+- Ticket 47900 - Server fails to start if password admin is set
+- Ticket 47892 - coverity defects found in 1.3.3.x
+
 * Wed Oct 01 2014 Noriko Hosoi <nhosoi@redhat.com> - 1.3.3.4-1
 - Release 1.3.3.4
 - Ticket 47880 - CI test: added test cases for ticket 47880
diff --git a/sources b/sources
index ef72e42..5ec8dc3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9c382296aaba2aa116c40c65b27632b8  389-ds-base-1.3.3.4.tar.bz2
+84869d46184039fce976b858e663232e  389-ds-base-1.3.3.5.tar.bz2