diff --git a/build.gradle b/build.gradle
index 42f7f9b0a10f0b1aff5979719ee33d3273dd0fd7..90448575930f3d5d47595408a121d4db872bab4f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -28,20 +28,22 @@ buildscript {
         }
     }
     dependencies {
-        classpath group: 'org.ros.rosjava_bootstrap', name: 'gradle_plugins', version: '0.1.0'
+        classpath group: 'org.ros.rosjava_bootstrap', name: 'gradle_plugins', version: '0.1.+'
     }
 }
 
+apply plugin: 'catkin'
+
 allprojects {
-  group 'org.ros.rosjava_core'
-  version = '0.1.0'
+    group 'org.ros.rosjava_core'
+    version = project.catkin.pkg.version
 }
 
 subprojects {
-  if (name != 'docs') {
-    apply plugin: 'ros'
-    apply plugin: 'ros-java'
-  }
+    if (name != 'docs') {
+        apply plugin: 'ros'
+        apply plugin: 'ros-java'
+    }
 }
 
 defaultTasks 'uploadArchives'
diff --git a/message_generation_tests/build.gradle b/message_generation_tests/build.gradle
index 2d053391fd8e04c8e175c94b1e790be03da064ef..b0fc72bdbc3cc8beacdd3724f5b6e1501cf69110 100644
--- a/message_generation_tests/build.gradle
+++ b/message_generation_tests/build.gradle
@@ -14,8 +14,6 @@
  * the License.
  */
 
-version='0.1.0'
-
 dependencies {
   compile 'org.ros.rosjava_messages:rosjava_test_msgs:0.1.+'
   compile 'org.ros.rosjava_bootstrap:message_generation:0.1.+'
diff --git a/package.xml b/package.xml
index 7ede6d8aac29c0164717fde0a38d8578b9a60f7d..7b340fad272256fe082aaf72f36bbffe5f3de5b0 100644
--- a/package.xml
+++ b/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package>
   <name>rosjava_core</name>
-  <version>0.0.0</version>
+  <version>0.1.0</version>
   <description>
     An implementation of ROS in pure-Java with Android support.
   </description>