diff --git a/cmake/FindMAVLink.cmake b/cmake/FindMAVLink.cmake
index 8de3079..3fdae02 100644
--- a/cmake/FindMAVLink.cmake
+++ b/cmake/FindMAVLink.cmake
@@ -19,6 +19,7 @@ set(_MAVLINK_EXTRA_SEARCH_HINTS
     ${CMAKE_SOURCE_DIR}/mavlink/
     ../../mavlink/
     ../mavlink/
+    $ENV{HOME}/PX4-Autopilot/mavlink/include
     ${CATKIN_DEVEL_PREFIX}/
     )
 
 
diff --git a/package.xml b/package.xml
index ae0fb34..12f17b8 100644
--- a/package.xml
+++ b/package.xml
@@ -50,8 +50,8 @@
   <build_depend>roscpp</build_depend>
   <build_depend>sensor_msgs</build_depend>
   <build_depend>std_msgs</build_depend>
-  <build_depend>python-rospkg</build_depend>
-  <build_depend>python-jinja2</build_depend>
+  <build_depend>python3-rospkg</build_depend>
+  <build_depend>python3-jinja2</build_depend>
   <run_depend>eigen</run_depend>
   <run_depend>gazebo_ros</run_depend>
   <run_depend>geometry_msgs</run_depend>