diff --git a/CASA-auth-token/server-java/Svc/linux/CasaBasicATSSetup.sh b/CASA-auth-token/server-java/Svc/linux/CasaBasicATSSetup.sh
index f58f76cc..21818dbd 100755
--- a/CASA-auth-token/server-java/Svc/linux/CasaBasicATSSetup.sh
+++ b/CASA-auth-token/server-java/Svc/linux/CasaBasicATSSetup.sh
@@ -125,7 +125,7 @@ function setup_iaRealms_file
                if [ "$LDAP_LISTEN_PORT" != '' ]; then
                   sed -i s:LDAP_LISTEN_PORT:$LDAP_LISTEN_PORT:g $CONFIG_FILE
                else
-                  sed -i s:LDAP_LISTEN_PORT:389:g $CONFIG_FILE
+                  sed -i s:LDAP_LISTEN_PORT:636:g $CONFIG_FILE
                fi
                return 0
             else
diff --git a/CASA-auth-token/server-java/Svc/templates/iaRealms.xml b/CASA-auth-token/server-java/Svc/templates/iaRealms.xml
index 928c379b..9ead7d19 100644
--- a/CASA-auth-token/server-java/Svc/templates/iaRealms.xml
+++ b/CASA-auth-token/server-java/Svc/templates/iaRealms.xml
@@ -11,7 +11,7 @@
 		<bci:env prop="java.naming.security.principal" value="PROXY_USER_NAME"/>
 		<bci:env prop="java.naming.security.credentials" value="PROXY_USER_PW"/>
 		<bci:connection xsi:type="bci:LDAPConnector">
-			<bci:address>ldap://LDAP_HOST_NAME:LDAP_LISTEN_PORT</bci:address>
+			<bci:address>ldaps://LDAP_HOST_NAME:LDAP_LISTEN_PORT</bci:address>
 		</bci:connection>
 	</bci:realm>
 	<bci:realm desc="Realm Join Definition" id="E263CCC1-8F9D-4551-B786-068AA84E8564">
diff --git a/CASA-auth-token/server-java/package/linux/CASA_auth_token_svc.changes b/CASA-auth-token/server-java/package/linux/CASA_auth_token_svc.changes
index 43c9cd9b..7694e7a5 100644
--- a/CASA-auth-token/server-java/package/linux/CASA_auth_token_svc.changes
+++ b/CASA-auth-token/server-java/package/linux/CASA_auth_token_svc.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Dec  4 10:26:16 MST 2006 - jluciani@novell.com
+
+- Fixed ATS Setup BUG225426. 
+
 -------------------------------------------------------------------
 Tue Nov 28 09:39:05 MST 2006 - jluciani@novell.com
 
diff --git a/CASA-auth-token/yast2-casa-ats/package/yast2-casa-ats.changes b/CASA-auth-token/yast2-casa-ats/package/yast2-casa-ats.changes
index 0674bc98..d240203a 100644
--- a/CASA-auth-token/yast2-casa-ats/package/yast2-casa-ats.changes
+++ b/CASA-auth-token/yast2-casa-ats/package/yast2-casa-ats.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Dec  4 10:27:48 MST 2006 - jluciani@novell.com
+
+- The bug that Ryan referes to below is BUG225426. 
+
 -------------------------------------------------------------------
 Mon Dec  4 09:25:32 MST 2006 - rpartridge@novell.com