diff --git a/bin/start-server b/bin/start-server
index f5547f2563..7acbe1cbd7 100755
--- a/bin/start-server
+++ b/bin/start-server
@@ -1 +1,32 @@
-java -Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=8888,suspend=n -Xms128M -Xmx2G -XX:SurvivorRatio=8 -XX:TargetSurvivorRatio=90 -XX:+AggressiveOpts -XX:+UseParNewGC -XX:+UseConcMarkSweepGC -XX:CMSInitiatingOccupancyFraction=1 -XX:+CMSParallelRemarkEnabled -XX:+HeapDumpOnOutOfMemoryError -Dcom.sun.management.jmxremote.port=8080 -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false -Dcassandra -Dstorage-config=conf -cp conf:lib/j2ee.jar:lib/log4j-1.2.15.jar:lib/xerces.jar:lib/asm-all-2.2.1.jar:lib/libthrift.jar:lib/libfb303.jar:build/cassandra.jar:lib/azul-collections.jar:lib/commons-math-1.1.jar:lib/zookeeper-3.0.0.jar:lib/antlr-3.0.1.jar:lib/commons-cli-1.1.jar:jline-0.9.94.jar:lib/commons-lang-2.4.jar org.apache.cassandra.service.CassandraServer
+#! /usr/bin/env bash
+bin=`dirname "$0"`
+bin=`cd "$bin"; pwd`
+
+confpath="$bin/../conf"
+cygwin=false
+case "`uname`" in
+CYGWIN*) cygwin=true;;
+esac
+
+
+# CLASSPATH initially contains cassandra jar
+CLASSPATH="$bin/../build/cassandra.jar"
+
+# add libs to CLASSPATH
+for f in $bin/../lib/*.jar; do
+  CLASSPATH=${CLASSPATH}:$f;
+done
+
+CLASSPATH=conf:${CLASSPATH};
+
+# cygwin path translation
+if $cygwin; then
+echo "in cygwin"
+echo $CLASSPATH
+  CLASSPATH=`cygpath -p -w "$CLASSPATH"`
+confpath=`cygpath -p -w "$confpath"`
+fi
+
+
+# run it
+java -Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=8888,suspend=n -Xms128M -Xmx2G -XX:SurvivorRatio=8 -XX:TargetSurvivorRatio=90 -XX:+AggressiveOpts -XX:+UseParNewGC -XX:+UseConcMarkSweepGC -XX:CMSInitiatingOccupancyFraction=1 -XX:+CMSParallelRemarkEnabled -XX:+HeapDumpOnOutOfMemoryError -Dcom.sun.management.jmxremote.port=8080 -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false -Dcassandra -Dstorage-config="$confpath" -cp "$CLASSPATH" org.apache.cassandra.service.CassandraServer &
diff --git a/bin/stop-server b/bin/stop-server
index 1e3c7beb3c..0490123acb 100755
--- a/bin/stop-server
+++ b/bin/stop-server
@@ -1 +1,2 @@
-pgrep -f cassandra | xargs kill -9
+user=`whoami`
+pgrep -u $user -f cassandra | xargs kill -9