diff --git a/flink-core/src/main/java/org/apache/flink/configuration/ConfigConstants.java b/flink-core/src/main/java/org/apache/flink/configuration/ConfigConstants.java
index dc242b29b7ff6282d4bbb387154dd3e24dee6e19..9ec71d21ca08c79d14d651e6b0f167ee93622891 100644
--- a/flink-core/src/main/java/org/apache/flink/configuration/ConfigConstants.java
+++ b/flink-core/src/main/java/org/apache/flink/configuration/ConfigConstants.java
@@ -452,12 +452,12 @@ public final class ConfigConstants {
 	
 	public static final String FLINK_JVM_OPTIONS = "env.java.opts";
 
-  	// --------------------------- Recovery -----------------------------------
+	// --------------------------- Recovery -----------------------------------
 
 	/** Defines recovery mode used for the cluster execution ("standalone", "zookeeper") */
 	public static final String RECOVERY_MODE = "recovery.mode";
 
-  	// --------------------------- ZooKeeper ----------------------------------
+	// --------------------------- ZooKeeper ----------------------------------
 
 	/** ZooKeeper servers. */
 	public static final String ZOOKEEPER_QUORUM_KEY = "ha.zookeeper.quorum";
diff --git a/flink-dist/src/main/flink-bin/bin/jobmanager.sh b/flink-dist/src/main/flink-bin/bin/jobmanager.sh
index c89f53a2db2d70fafcc9381d8c470a3d077589a0..c18a9092e36a764879b98e9b4eff4a67d5132f85 100755
--- a/flink-dist/src/main/flink-bin/bin/jobmanager.sh
+++ b/flink-dist/src/main/flink-bin/bin/jobmanager.sh
@@ -72,4 +72,4 @@ if [[ $STARTSTOP == "start" ]]; then
     fi
 fi
 
-${bin}/flink-daemon.sh $STARTSTOP jobmanager "${args}"
+${FLINK_BIN_DIR}/flink-daemon.sh $STARTSTOP jobmanager "${args}"
diff --git a/flink-dist/src/main/flink-bin/bin/start-cluster.sh b/flink-dist/src/main/flink-bin/bin/start-cluster.sh
index 1fdd885ea422f183bbf1d8d541985dcbdf16cb91..6cf9dda44519ffeee54e13f968dbd6ab264c0165 100755
--- a/flink-dist/src/main/flink-bin/bin/start-cluster.sh
+++ b/flink-dist/src/main/flink-bin/bin/start-cluster.sh
@@ -49,7 +49,7 @@ else
     echo "Starting cluster (${STREAMING_MODE} mode)."
 
     # Start single JobManager on this machine
-    "$bin"/jobmanager.sh start cluster ${STREAMING_MODE}
+    "$FLINK_BIN_DIR"/jobmanager.sh start cluster ${STREAMING_MODE}
 fi
 shopt -u nocasematch
 
diff --git a/flink-dist/src/main/flink-bin/bin/start-zookeeper-quorum.sh b/flink-dist/src/main/flink-bin/bin/start-zookeeper-quorum.sh
index d2ff914dcdcda29d16a5d9dd750fc61528272386..67d534950cb4c5a2b13ac83516d74e3475480942 100755
--- a/flink-dist/src/main/flink-bin/bin/start-zookeeper-quorum.sh
+++ b/flink-dist/src/main/flink-bin/bin/start-zookeeper-quorum.sh
@@ -39,7 +39,7 @@ while read server ; do
         id=${BASH_REMATCH[1]}
         address=${BASH_REMATCH[2]}
 
-        ssh -n $FLINK_SSH_OPTS $address -- "nohup /bin/bash -l $bin/zookeeper.sh start $id &"
+        ssh -n $FLINK_SSH_OPTS $address -- "nohup /bin/bash -l $FLINK_BIN_DIR/zookeeper.sh start $id &"
     else
         echo "[WARN] Parse error. Skipping config entry '$server'."
     fi
diff --git a/flink-dist/src/main/flink-bin/bin/stop-cluster.sh b/flink-dist/src/main/flink-bin/bin/stop-cluster.sh
index d6dd572cb4555c9753423071c7208547a04bee16..d8676be2437f033e191eada0472f40899ed8e992 100755
--- a/flink-dist/src/main/flink-bin/bin/stop-cluster.sh
+++ b/flink-dist/src/main/flink-bin/bin/stop-cluster.sh
@@ -26,7 +26,7 @@ bin=`cd "$bin"; pwd`
 readSlaves
 
 for slave in ${SLAVES[@]}; do
-    ssh -n $FLINK_SSH_OPTS $slave -- "nohup /bin/bash -l $bin/taskmanager.sh stop &"
+    ssh -n $FLINK_SSH_OPTS $slave -- "nohup /bin/bash -l $FLINK_BIN_DIR/taskmanager.sh stop &"
 done
 
 # Stop JobManager instance(s)
@@ -36,10 +36,10 @@ if [[ $RECOVERY_MODE == "zookeeper" ]]; then
     readMasters
 
     for master in ${MASTERS[@]}; do
-        ssh -n $FLINK_SSH_OPTS $master -- "nohup /bin/bash -l $bin/jobmanager.sh stop &"
+        ssh -n $FLINK_SSH_OPTS $master -- "nohup /bin/bash -l $FLINK_BIN_DIR/jobmanager.sh stop &"
     done
 
 else
-	  "$bin"/jobmanager.sh stop
+	  "$FLINK_BIN_DIR"/jobmanager.sh stop
 fi
 shopt -u nocasematch
diff --git a/flink-dist/src/main/flink-bin/bin/stop-zookeeper-quorum.sh b/flink-dist/src/main/flink-bin/bin/stop-zookeeper-quorum.sh
index 4d19cbdf2b9a27ffba5e6276eea77ac2c49d4a10..b30664850fb68849acfd50c68fffee9413086655 100755
--- a/flink-dist/src/main/flink-bin/bin/stop-zookeeper-quorum.sh
+++ b/flink-dist/src/main/flink-bin/bin/stop-zookeeper-quorum.sh
@@ -39,7 +39,7 @@ while read server ; do
         id=${BASH_REMATCH[1]}
         server=${BASH_REMATCH[2]}
 
-        ssh -n $FLINK_SSH_OPTS $server -- "nohup /bin/bash -l $bin/zookeeper.sh stop &"
+        ssh -n $FLINK_SSH_OPTS $server -- "nohup /bin/bash -l $FLINK_BIN_DIR/zookeeper.sh stop &"
     else
         echo "[WARN] Parse error. Skipping config entry '$server'."
     fi
diff --git a/flink-dist/src/main/flink-bin/bin/taskmanager.sh b/flink-dist/src/main/flink-bin/bin/taskmanager.sh
index 2bc20d9bd4ab13d98949d5511f1bfba33c6faffe..c41270d554943d69896ef2754eb135b871e33e12 100755
--- a/flink-dist/src/main/flink-bin/bin/taskmanager.sh
+++ b/flink-dist/src/main/flink-bin/bin/taskmanager.sh
@@ -64,4 +64,4 @@ if [[ $STARTSTOP == "start" ]]; then
     args="--configDir ${FLINK_CONF_DIR} --streamingMode ${STREAMINGMODE}"
 fi
 
-${bin}/flink-daemon.sh $STARTSTOP taskmanager "${args}"
+${FLINK_BIN_DIR}/flink-daemon.sh $STARTSTOP taskmanager "${args}"
diff --git a/flink-dist/src/main/flink-bin/bin/zookeeper.sh b/flink-dist/src/main/flink-bin/bin/zookeeper.sh
index 0bbf6d5ab99cae2a6d38b4aaa8d625f582ee2d8d..a476989ae8b93934165a2789a84856612c9d586d 100755
--- a/flink-dist/src/main/flink-bin/bin/zookeeper.sh
+++ b/flink-dist/src/main/flink-bin/bin/zookeeper.sh
@@ -53,4 +53,4 @@ if [[ $STARTSTOP == "start" ]]; then
     args="--zkConfigFile $ZK_CONF --peerId $PEER_ID"
 fi
 
-${bin}/flink-daemon.sh $STARTSTOP zookeeper "${args}"
+${FLINK_BIN_DIR}/flink-daemon.sh $STARTSTOP zookeeper "${args}"