diff --git a/.project b/.project
index e88e447..4203c0e 100644
--- a/.project
+++ b/.project
@@ -6,12 +6,12 @@
 	</projects>
 	<buildSpec>
 		<buildCommand>
-			<name>org.python.pydev.PyDevBuilder</name>
+			<name>org.python3.pydev.PyDevBuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>
-		<nature>org.python.pydev.pythonNature</nature>
+		<nature>org.python3.pydev.pythonNature</nature>
 	</natures>
 </projectDescription>
diff --git a/.pydevproject b/.pydevproject
index 0ebadbb..a6ba252 100644
--- a/.pydevproject
+++ b/.pydevproject
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?eclipse-pydev version="1.0"?><pydev_project>
-<pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
+<pydev_pathproperty name="org.python3.pydev.PROJECT_SOURCE_PATH">
 <path>/${PROJECT_DIR_NAME}/src</path>
 </pydev_pathproperty>
-<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property>
-<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
+<pydev_property name="org.python3.pydev.PYTHON_PROJECT_VERSION">python3 2.7</pydev_property>
+<pydev_property name="org.python3.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
 </pydev_project>
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index c521aa9..19f7f01 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -34,7 +34,7 @@ Changelog for package genjava
 
 0.1.3 (2015-02-28)
 ------------------
-* add data parts to the python package.
+* add data parts to the python3 package.
 * Contributors: Daniel Stonier
 
 0.1.2 (2015-02-27)
diff --git a/package.xml b/package.xml
index 86233ab..779970f 100644
--- a/package.xml
+++ b/package.xml
@@ -20,16 +20,19 @@
   <author>Daniel Stonier</author>
 
   <buildtool_depend version_gte="0.5.78">catkin</buildtool_depend>
-  <buildtool_depend condition="$ROS_PYTHON_VERSION == 2">python-setuptools</buildtool_depend>
+  <buildtool_depend condition="$ROS_PYTHON_VERSION == 3">python3-setuptools</buildtool_depend>
+  <build_depend>genmsg</build_depend>
+  <build_depend>python3-catkin-pkg</build_depend>
+  <build_depend>python3-rospkg</build_depend>
+  <build_depend>rosjava_bootstrap</build_depend>
+  <build_depend>rosjava_build_tools</build_depend>
   <buildtool_depend condition="$ROS_PYTHON_VERSION == 3">python3-setuptools</buildtool_depend>
 
-  <depend>genmsg</depend>
-  <depend condition="$ROS_PYTHON_VERSION == 2">python-catkin-pkg</depend>
-  <depend condition="$ROS_PYTHON_VERSION == 2">python-rospkg</depend>
-  <depend condition="$ROS_PYTHON_VERSION == 3">python3-catkin-pkg</depend>
-  <depend condition="$ROS_PYTHON_VERSION == 3">python3-rospkg</depend>
-  <depend>rosjava_bootstrap</depend>
-  <depend>rosjava_build_tools</depend>
+  <run_depend>genmsg</run_depend>
+  <run_depend condition="$ROS_PYTHON_VERSION == 3">python3-catkin-pkg</run_depend>
+  <run_depend condition="$ROS_PYTHON_VERSION == 3">python3-rospkg</run_depend>
+  <run_depend>rosjava_bootstrap</run_depend>
+  <run_depend>rosjava_build_tools</run_depend>
 
   <export>
     <message_generator>java</message_generator>
diff --git a/scripts/genjava_gradle_project.py b/scripts/genjava_gradle_project.py
index 57fc504..31bbee5 100755
--- a/scripts/genjava_gradle_project.py
+++ b/scripts/genjava_gradle_project.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 """
 ROS message source code generation for Java, integration with ros' message_generation.
diff --git a/scripts/genjava_message_artifacts b/scripts/genjava_message_artifacts
index 4453283..6c1aa1f 100755
--- a/scripts/genjava_message_artifacts
+++ b/scripts/genjava_message_artifacts
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 """
 ROS message source code generation for Java, from the command line.
diff --git a/setup.py b/setup.py
index cf9ec7a..6b7fd2a 100644
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 from setuptools import setup
 from catkin_pkg.python_setup import generate_distutils_setup
diff --git a/src/genjava/__pycache__/genjava_main.cpython-38.pyc b/src/genjava/__pycache__/genjava_main.cpython-38.pyc
new file mode 100644
index 0000000..d01a96d
Binary files /dev/null and b/src/genjava/__pycache__/genjava_main.cpython-38.pyc differ
diff --git a/src/genjava/__pycache__/gradle_project.cpython-38.pyc b/src/genjava/__pycache__/gradle_project.cpython-38.pyc
new file mode 100644
index 0000000..e8cc2ce
Binary files /dev/null and b/src/genjava/__pycache__/gradle_project.cpython-38.pyc differ
diff --git a/src/genjava/gradle_project.py b/src/genjava/gradle_project.py
index 5ecfbca..ff336e0 100644
--- a/src/genjava/gradle_project.py
+++ b/src/genjava/gradle_project.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 ##############################################################################
 # Imports