diff --git a/server/build.gradle b/server/build.gradle
index e7cd55b54e3..c4c3d3f17b4 100644
--- a/server/build.gradle
+++ b/server/build.gradle
@@ -21,6 +21,37 @@ repositories {
     mavenCentral()
 }
 
+task compileProto(type: Exec) {
+    executable "./compileProto.sh"
+}
+task buildProtoLib(type: Copy) {
+    //just copy lib src to project
+    def pathToProtoKotSrc = "../proto/compiler/src/"
+    from pathToProtoKotSrc + "CodedInputStream.kt", pathToProtoKotSrc + "CodedOutputStream.kt",
+            pathToProtoKotSrc + "WireFormat.kt", pathToProtoKotSrc + "WireType.kt",
+            pathToProtoKotSrc + "InvalidProtocolBufferException.kt"
+    into "src/main/java"
+}
+
+task getDeps(type: Copy) {
+    from sourceSets.main.compileClasspath
+    into 'build/libs'
+}
+
+build.dependsOn getDeps
+compileKotlin.dependsOn compileProto
+compileProto.dependsOn buildProtoLib
+
+jar {
+    manifest {
+        attributes("Implementation-Title": "Gradle",
+                "Implementation-Version": version,
+                "Class-Path": "kotlin-runtime-1.0.3.jar kotlin-stdlib-1.0.3.jar netty-all-4.1.2.Final.jar",
+                "Main-Class": "ServerMainKt")
+    }
+
+}
+
 dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     compile "io.netty:netty-all:4.1.2.Final"
diff --git a/server/compileProto.sh b/server/compileProto.sh
index 1a9f2961a0d..90e69b996f4 100755
--- a/server/compileProto.sh
+++ b/server/compileProto.sh
@@ -1 +1 @@
-../proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc --kotlin_out="./src/" --proto_path="../proto/server_car" ../proto/server_car/*.proto
+../proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc --kotlin_out="./src/main/java" --proto_path="../proto/server_car" ../proto/server_car/*.proto