diff --git a/CHANGES.txt b/CHANGES.txt
index c9f08a2ac0e..9f747ba16bf 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -360,6 +360,8 @@ Other Changes
 
 10. Upgrade to Lucene 2.3.1
 
+11. SOLR-531: Different exit code for rsyncd-start and snappuller if disabled (Thomas Peuss via billa)
+
 Build
  1. SOLR-411.  Changed the names of the Solr JARs to use the defacto standard JAR names based on
     project-name-version.jar.  This yields, for example:
diff --git a/src/scripts/rsyncd-start b/src/scripts/rsyncd-start
index 6bfc130c2ab..f98b9b31975 100755
--- a/src/scripts/rsyncd-start
+++ b/src/scripts/rsyncd-start
@@ -98,7 +98,7 @@ logMessage command: $0 $@
 if [[ ! -f ${solr_root}/logs/rsyncd-enabled ]]
 then
     logMessage rsyncd disabled
-    exit 1
+    exit 2
 fi
 
 if \
diff --git a/src/scripts/snappuller b/src/scripts/snappuller
index 46de8f49cbc..4b6b98abffb 100755
--- a/src/scripts/snappuller
+++ b/src/scripts/snappuller
@@ -164,7 +164,7 @@ logMessage command: $0 $@
 if [[ ! -f ${solr_root}/logs/snappuller-enabled ]]
 then
     logMessage snappuller disabled
-    exit 1
+    exit 2
 fi
 
 # make sure we can ssh to master