diff --git a/demos/RxChat/pom.xml b/demos/RxChat/pom.xml
index e835533d..370ca837 100644
--- a/demos/RxChat/pom.xml
+++ b/demos/RxChat/pom.xml
@@ -68,7 +68,7 @@
                 <artifactId>protobuf-maven-plugin</artifactId>
                 <version>0.5.0</version>
                 <configuration>
-                    <protocArtifact>com.google.protobuf:protoc:3.0.2:exe:${os.detected.classifier}</protocArtifact>
+                    <protocArtifact>com.google.protobuf:protoc:${protoc.version}:exe:${os.detected.classifier}</protocArtifact>
                     <pluginId>grpc-java</pluginId>
                     <pluginArtifact>io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier}</pluginArtifact>
                 </configuration>
diff --git a/demos/grpc-java-contrib-demo/time-client-demo/pom.xml b/demos/grpc-java-contrib-demo/time-client-demo/pom.xml
index 28e52d11..c6c5adc5 100644
--- a/demos/grpc-java-contrib-demo/time-client-demo/pom.xml
+++ b/demos/grpc-java-contrib-demo/time-client-demo/pom.xml
@@ -45,7 +45,7 @@
                 <artifactId>protobuf-maven-plugin</artifactId>
                 <version>0.5.0</version>
                 <configuration>
-                    <protocArtifact>com.google.protobuf:protoc:3.0.2:exe:${os.detected.classifier}</protocArtifact>
+                    <protocArtifact>com.google.protobuf:protoc:${protoc.version}:exe:${os.detected.classifier}</protocArtifact>
                     <pluginId>grpc-java</pluginId>
                     <pluginArtifact>io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier}</pluginArtifact>
                 </configuration>
diff --git a/demos/grpc-java-contrib-demo/time-service-demo/pom.xml b/demos/grpc-java-contrib-demo/time-service-demo/pom.xml
index a3ba466d..b7286ade 100644
--- a/demos/grpc-java-contrib-demo/time-service-demo/pom.xml
+++ b/demos/grpc-java-contrib-demo/time-service-demo/pom.xml
@@ -74,7 +74,7 @@
                 <artifactId>protobuf-maven-plugin</artifactId>
                 <version>0.5.0</version>
                 <configuration>
-                    <protocArtifact>com.google.protobuf:protoc:3.0.2:exe:${os.detected.classifier}</protocArtifact>
+                    <protocArtifact>com.google.protobuf:protoc:${protoc.version}:exe:${os.detected.classifier}</protocArtifact>
                     <pluginId>grpc-java</pluginId>
                     <pluginArtifact>io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier}</pluginArtifact>
                 </configuration>
diff --git a/grpc-contrib/pom.xml b/grpc-contrib/pom.xml
index b5609a85..f991bfae 100644
--- a/grpc-contrib/pom.xml
+++ b/grpc-contrib/pom.xml
@@ -76,7 +76,7 @@
                 <artifactId>protobuf-maven-plugin</artifactId>
                 <version>0.5.0</version>
                 <configuration>
-                    <protocArtifact>com.google.protobuf:protoc:3.0.2:exe:${os.detected.classifier}</protocArtifact>
+                    <protocArtifact>com.google.protobuf:protoc:${protoc.version}:exe:${os.detected.classifier}</protocArtifact>
                     <pluginId>grpc-java</pluginId>
                     <pluginArtifact>io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier}</pluginArtifact>
                 </configuration>
diff --git a/grpc-spring/pom.xml b/grpc-spring/pom.xml
index 4a4349b2..17ee976f 100644
--- a/grpc-spring/pom.xml
+++ b/grpc-spring/pom.xml
@@ -95,7 +95,7 @@
                 <artifactId>protobuf-maven-plugin</artifactId>
                 <version>0.5.0</version>
                 <configuration>
-                    <protocArtifact>com.google.protobuf:protoc:3.0.2:exe:${os.detected.classifier}</protocArtifact>
+                    <protocArtifact>com.google.protobuf:protoc:${protoc.version}:exe:${os.detected.classifier}</protocArtifact>
                     <pluginId>grpc-java</pluginId>
                     <pluginArtifact>io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier}</pluginArtifact>
                 </configuration>
diff --git a/jprotoc-test/pom.xml b/jprotoc-test/pom.xml
index aa0d3f32..0ffa6856 100644
--- a/jprotoc-test/pom.xml
+++ b/jprotoc-test/pom.xml
@@ -96,7 +96,7 @@
                 <artifactId>protobuf-maven-plugin</artifactId>
                 <version>0.5.0</version>
                 <configuration>
-                    <protocArtifact>com.google.protobuf:protoc:3.0.2:exe:${os.detected.classifier}</protocArtifact>
+                    <protocArtifact>com.google.protobuf:protoc:${protoc.version}:exe:${os.detected.classifier}</protocArtifact>
                     <pluginId>grpc-java</pluginId>
                     <pluginArtifact>io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier}</pluginArtifact>
                 </configuration>
diff --git a/pom.xml b/pom.xml
index b90e9de3..aaaa5eda 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,6 +67,7 @@
         <!-- Dependency Versions -->
         <!-- Keep grpc.version in sync with srpc-grpc/java/pom.xml and srpc-grpc-dependencies/pom.xml -->
         <grpc.version>1.6.1</grpc.version>
+        <protoc.version>3.3.0</protoc.version> <!-- Same version as grpc-proto -->
         <mustache-java.version>0.9.4</mustache-java.version>
         <spring.version>4.2.0.RELEASE</spring.version>
 
@@ -118,6 +119,11 @@
                 <artifactId>rxgrpc-stub</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.salesforce.servicelibs</groupId>
+                <artifactId>jprotoc</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.grpc</groupId>
                 <artifactId>grpc-netty</artifactId>
diff --git a/rxgrpc/rxgrpc-tck/pom.xml b/rxgrpc/rxgrpc-tck/pom.xml
index 90e07398..ccb1f141 100644
--- a/rxgrpc/rxgrpc-tck/pom.xml
+++ b/rxgrpc/rxgrpc-tck/pom.xml
@@ -82,7 +82,7 @@
                 <artifactId>protobuf-maven-plugin</artifactId>
                 <version>0.5.0</version>
                 <configuration>
-                    <protocArtifact>com.google.protobuf:protoc:3.0.2:exe:${os.detected.classifier}</protocArtifact>
+                    <protocArtifact>com.google.protobuf:protoc:${protoc.version}:exe:${os.detected.classifier}</protocArtifact>
                     <pluginId>grpc-java</pluginId>
                     <pluginArtifact>io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier}</pluginArtifact>
                 </configuration>
diff --git a/rxgrpc/rxgrpc-test/pom.xml b/rxgrpc/rxgrpc-test/pom.xml
index 143db442..ee295afb 100644
--- a/rxgrpc/rxgrpc-test/pom.xml
+++ b/rxgrpc/rxgrpc-test/pom.xml
@@ -101,7 +101,7 @@
                 <artifactId>protobuf-maven-plugin</artifactId>
                 <version>0.5.0</version>
                 <configuration>
-                    <protocArtifact>com.google.protobuf:protoc:3.0.2:exe:${os.detected.classifier}</protocArtifact>
+                    <protocArtifact>com.google.protobuf:protoc:${protoc.version}:exe:${os.detected.classifier}</protocArtifact>
                     <pluginId>grpc-java</pluginId>
                     <pluginArtifact>io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier}</pluginArtifact>
                 </configuration>
diff --git a/rxgrpc/rxgrpc/pom.xml b/rxgrpc/rxgrpc/pom.xml
index 70a52eff..0daad9e5 100644
--- a/rxgrpc/rxgrpc/pom.xml
+++ b/rxgrpc/rxgrpc/pom.xml
@@ -28,7 +28,6 @@
         <dependency>
             <groupId>com.salesforce.servicelibs</groupId>
             <artifactId>jprotoc</artifactId>
-            <version>0.6.1-SNAPSHOT</version>
         </dependency>
     </dependencies>