diff --git a/.gitignore b/.gitignore
index 8156d6e8c10ea7ccf6ba0fa7c4c8e76c0c3c4f6a..5abdec5d50d8b68b20a6fbd05bdc1a952ac55370 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ third_party/libmesos.so
 third_party/libmesos.dylib
 conf/java-opts
 conf/spark-env.sh
+conf/log4j.properties
diff --git a/conf/log4j.properties b/conf/log4j.properties
new file mode 100644
index 0000000000000000000000000000000000000000..dfbf25db76ec68ab22b41ae1984b95673c105d08
--- /dev/null
+++ b/conf/log4j.properties
@@ -0,0 +1,4 @@
+log4j.rootCategory=INFO, console
+log4j.appender.console=org.apache.log4j.ConsoleAppender
+log4j.appender.console.layout=org.apache.log4j.PatternLayout
+log4j.appender.console.layout.ConversionPattern=%d{yy/MM/dd HH:mm:ss} %p %c{1}: %m%n
diff --git a/run b/run
index ab6889b157fe5649765fceafd27f9d6106ccd6bb..fe4b9295005bd726687a935c4e90d7ee65dd4090 100755
--- a/run
+++ b/run
@@ -29,6 +29,7 @@ export JAVA_OPTS
 
 # Build up classpath
 SPARK_CLASSPATH="$SPARK_CLASSPATH:$FWDIR/build/classes"
+SPARK_CLASSPATH+=:$FWDIR/conf
 SPARK_CLASSPATH+=:$FWDIR/third_party/mesos.jar
 SPARK_CLASSPATH+=:$FWDIR/third_party/asm-3.2/lib/all/asm-all-3.2.jar
 SPARK_CLASSPATH+=:$FWDIR/third_party/colt.jar