diff --git a/java/Makefile b/java/Makefile
index b7d44fc254ee8aa92540cbabbac32fb0601c5e32..821cc4acc40ed52a9d8b35b97da84d16e6cc6876 100644
--- a/java/Makefile
+++ b/java/Makefile
@@ -99,6 +99,10 @@ MAIN_CLASSES = $(OUTPUT)/classes
 TEST_CLASSES = $(OUTPUT)/test-classes
 JAVADOC = $(OUTPUT)/apidocs
 
+BENCHMARK_MAIN_SRC = benchmark/src/main/java
+BENCHMARK_OUTPUT = benchmark/target
+BENCHMARK_MAIN_CLASSES = $(BENCHMARK_OUTPUT)/classes
+
 JAVA_TEST_LIBDIR = ./test-libs/
 JAVA_JUNIT_JAR = $(JAVA_TEST_LIBDIR)junit-4.12-beta-2.jar
 JAVA_HAMCR_JAR = $(JAVA_TEST_LIBDIR)hamcrest-core-1.3.jar
@@ -111,6 +115,7 @@ clean:
 	rm -rf include/*
 	rm -rf test-libs/
 	rm -rf $(OUTPUT)
+	rm -rf $(BENCHMARK_OUTPUT)
 
 
 javadocs:
@@ -162,4 +167,5 @@ test: java resolve_test_deps java_test
 	java -ea -Xcheck:jni -Djava.library.path=target -cp "$(MAIN_CLASSES):$(TEST_CLASSES):$(JAVA_TESTCLASSPATH)" org.rocksdb.test.RocksJunitRunner $(JAVA_TESTS)
 
 db_bench: java
-	javac org/rocksdb/benchmark/*.java
+	mkdir -p $(BENCHMARK_MAIN_CLASSES)
+	javac -cp $(MAIN_CLASSES) -d $(BENCHMARK_MAIN_CLASSES) $(BENCHMARK_MAIN_SRC)/org/rocksdb/benchmark/*.java
diff --git a/java/org/rocksdb/benchmark/DbBenchmark.java b/java/benchmark/src/main/java/org/rocksdb/benchmark/DbBenchmark.java
similarity index 100%
rename from java/org/rocksdb/benchmark/DbBenchmark.java
rename to java/benchmark/src/main/java/org/rocksdb/benchmark/DbBenchmark.java
diff --git a/java/jdb_bench.sh b/java/jdb_bench.sh
index 92ee6e3dbef0099ceaa0e4a75bfc5ec8aeefef37..9665de785ed480686e7f4e5ea6b1e624b5725845 100755
--- a/java/jdb_bench.sh
+++ b/java/jdb_bench.sh
@@ -3,5 +3,8 @@ if [ `getconf LONG_BIT` != "64" ]
 then
   PLATFORM=32
 fi
+
+ROCKS_JAR=`find target -name rocksdbjni*.jar`
+
 echo "Running benchmark in $PLATFORM-Bit mode."
-java -server -d$PLATFORM -XX:NewSize=4m -XX:+AggressiveOpts -Djava.library.path=.:../ -cp "rocksdbjni.jar:.:./*" org.rocksdb.benchmark.DbBenchmark $@
+java -server -d$PLATFORM -XX:NewSize=4m -XX:+AggressiveOpts -Djava.library.path=target -cp "${ROCKS_JAR}:benchmark/target/classes" org.rocksdb.benchmark.DbBenchmark $@