diff --git a/core/src/main/resources/oozie-default.xml b/core/src/main/resources/oozie-default.xml
index 8d34be4..13d7f1e 100644
--- a/core/src/main/resources/oozie-default.xml
+++ b/core/src/main/resources/oozie-default.xml
@@ -106,7 +106,7 @@
         <description>
             Oozie server timezone. Valid values are UTC and GMT(+/-)####, for example 'GMT+0530' would be India
             timezone. All dates parsed and genered dates by Oozie Coordinator/Bundle will be done in the specified
-            timezone. The default value of 'UTC' should not be changed under normal circumtances. If for any reason
+            timezone. The default value of 'UTC' should not be changed under normal circumstances. If for any reason
             is changed, note that GMT(+/-)#### timezones do not observe DST changes.
         </description>
     </property>
@@ -298,8 +298,8 @@
             oozie.service.AuthorizationService.security.enabled
         </value>
         <description>
-            Specifies "oozie.*" properties to cannot be overriden via Java system properties.
-            Property names must be separted by commas.
+            Specifies "oozie.*" properties to cannot be overridden via Java system properties.
+            Property names must be separated by commas.
         </description>
     </property>
 
@@ -2165,7 +2165,7 @@
         <name>oozie.service.HadoopAccessorService.jobTracker.whitelist</name>
         <value> </value>
         <description>
-            Whitelisted job tracker for Oozie service.
+            Comma separated list of whitelisted job trackers for Oozie service.
         </description>
     </property>
 
@@ -2173,7 +2173,7 @@
         <name>oozie.service.HadoopAccessorService.nameNode.whitelist</name>
         <value> </value>
         <description>
-            Whitelisted job tracker for Oozie service.
+            Comma separated list of whitelisted name nodes for Oozie service.
         </description>
     </property>
 
@@ -2533,6 +2533,10 @@
     <property>
         <name>oozie.service.EventHandlerService.event.listeners</name>
         <value>org.apache.oozie.jms.JMSJobEventListener</value>
+        <description>
+            List of implementations for JobEventListener and SLAEventListener to calculate SLA and send Email/JMS SLA
+            and JMS job notifications. In case of multiple classes, names must be separated by commas.
+        </description>
     </property>
 
     <property>
@@ -2749,7 +2753,7 @@
         <value></value>
         <description>
             Password to the TrustStore.
-        </description>TestSSLServerConnectorFactory
+        </description>
     </property>
 
     <property>
diff --git a/docs/src/site/markdown/AG_HadoopConfiguration.md b/docs/src/site/markdown/AG_HadoopConfiguration.md
index 349cac4..6d9d73b 100644
--- a/docs/src/site/markdown/AG_HadoopConfiguration.md
+++ b/docs/src/site/markdown/AG_HadoopConfiguration.md
@@ -15,14 +15,14 @@
         <name>oozie.service.HadoopAccessorService.jobTracker.whitelist</name>
         <value> </value>
         <description>
-            Whitelisted job tracker for Oozie service.
+            Comma separated list of whitelisted job trackers for Oozie service.
         </description>
     </property>
     <property>
         <name>oozie.service.HadoopAccessorService.nameNode.whitelist</name>
         <value> </value>
         <description>
-            Whitelisted job tracker for Oozie service.
+            Comma separated list of whitelisted name nodes for Oozie service.
         </description>
     </property>
 ...
diff --git a/release-log.txt b/release-log.txt
index 809e598..46c1da8 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
 -- Oozie 5.3.0 release (trunk - unreleased)
 
+OOZIE-3573 Fix oozie-default.xml descriptions (arvaiadam via asalamon74)
 OOZIE-3571 Wrong log string substitution in CredentialsProviderFactory class (arvaiadam via asalamon74)
 OOZIE-3566 Wrong numbers provided by Oozie monitoring webservices.requests sampler (cas via asalamon74)
 OOZIE-3557 [build] Update required minimum maven version (asalamon74 via kmarton)