diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0d37397..f846c78 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,10 +1,9 @@
-cmake_minimum_required(VERSION 2.8.3)
+cmake_minimum_required(VERSION 3.3)
 project(rttlua_completion)
 
-find_package(catkin REQUIRED)
-catkin_package()
-catkin_add_env_hooks(10.rttlua_completion SHELLS sh DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/env-hooks)
-
+find_package(ament_cmake REQUIRED)
+ament_environment_hooks(env-hooks/rttlua_completion.sh.in)
+ament_package()
 #############
 ## Install ##
 #############
@@ -49,11 +48,12 @@ set_target_properties(readline PROPERTIES PREFIX "")
 file(GLOB LUA_FILES "*.lua")
 install(
   FILES ${LUA_FILES}
-  DESTINATION ${CATKIN_GLOBAL_SHARE_DESTINATION}/lua/5.1/rttlua_completion/
+  DESTINATION share/lua/5.1/rttlua_completion/
 )
 
 install(
   TARGETS readline
-  DESTINATION ${CATKIN_GLOBAL_SHARE_DESTINATION}/lua/5.1/rttlua_completion/
+  DESTINATION share/lua/5.1/rttlua_completion/
 )
 
+
diff --git a/env-hooks/10.rttlua_completion.sh.develspace.in b/env-hooks/10.rttlua_completion.sh.develspace.in
deleted file mode 100644
index 0af8d5c..0000000
--- a/env-hooks/10.rttlua_completion.sh.develspace.in
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-if [ "x$LUA_PATH" = "x" ]; then
-   LUA_PATH=";"
-fi
-export LUA_PATH="$LUA_PATH;@CMAKE_CURRENT_SOURCE_DIR@/?.lua"
-
-if [ "x$LUA_CPATH" = "x" ]; then
-   LUA_CPATH=";"
-fi
-export LUA_CPATH="$LUA_CPATH;@CMAKE_CURRENT_SOURCE_DIR@/?.so"
diff --git a/env-hooks/10.rttlua_completion.sh.installspace.in b/env-hooks/rttlua_completion.sh.in
similarity index 100%
rename from env-hooks/10.rttlua_completion.sh.installspace.in
rename to env-hooks/rttlua_completion.sh.in
diff --git a/manifest.xml b/manifest.xml
deleted file mode 100644
index dc796bf..0000000
--- a/manifest.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<package>
-  <description brief="rttlua completion support"></description>
-  <author>Markus Klotzbuecher, markus.klotzbuecher@mech.kuleuven.be</author>
-  <license>MIT</license>
-  <review status="unreviewed" notes=""/>
-</package>
diff --git a/package.xml b/package.xml
index d8a2ba8..eb452c3 100644
--- a/package.xml
+++ b/package.xml
@@ -15,8 +15,12 @@
 
   <!-- The *_depend tags are used to specify dependencies -->
   <!-- Dependencies can be catkin packages or system dependencies -->
-  <buildtool_depend>catkin</buildtool_depend>
+  <buildtool_depend>ament_cmake</buildtool_depend>
 
   <run_depend>ocl</run_depend>
+  
+   <export>
+    <build_type>ament_cmake</build_type>
+  </export>
 
 </package>