diff --git a/collada_urdf/CMakeLists.txt b/collada_urdf/CMakeLists.txt
index 524f2e9..6bd3707 100644
--- a/collada_urdf/CMakeLists.txt
+++ b/collada_urdf/CMakeLists.txt
@@ -12,12 +12,12 @@ catkin_package(
 
 include_directories(include)
 
-find_package(assimp QUIET)
+find_package(assimp_devel QUIET NAMES ASSIMP)
 if ( NOT ASSIMP_FOUND )
-  find_package(Assimp QUIET)
+  find_package(Assimp_Devel QUIET NAMES ASSIMP)
   if ( NOT ASSIMP_FOUND )
     find_package(PkgConfig REQUIRED)
-    pkg_check_modules(ASSIMP assimp)
+    pkg_check_modules(ASSIMP assimp_devel)
   endif()
 endif()
 if( ASSIMP_FOUND )
diff --git a/collada_urdf/src/collada_to_urdf.cpp b/collada_urdf/src/collada_to_urdf.cpp
index 616f58a..d4bbf2a 100644
--- a/collada_urdf/src/collada_to_urdf.cpp
+++ b/collada_urdf/src/collada_to_urdf.cpp
@@ -6,12 +6,12 @@
 #include <urdf_parser/urdf_parser.h>
 
 #if defined(ASSIMP_UNIFIED_HEADER_NAMES)
-#include <assimp/IOSystem.hpp>
-#include <assimp/IOStream.hpp>
-#include <assimp/Importer.hpp>
-#include <assimp/Exporter.hpp>
-#include <assimp/postprocess.h>
-#include <assimp/scene.h>
+#include <IOSystem.hpp>
+#include <IOStream.hpp>
+#include <Importer.hpp>
+#include <Exporter.hpp>
+#include <postprocess.h>
+#include <scene.h>
 #else
 #include <assimp.hpp>
 #if defined(ASSIMP_EXPORT_API)
diff --git a/collada_urdf/src/collada_urdf.cpp b/collada_urdf/src/collada_urdf.cpp
index 23be87c..1aeac58 100644
--- a/collada_urdf/src/collada_urdf.cpp
+++ b/collada_urdf/src/collada_urdf.cpp
@@ -63,13 +63,13 @@
 #include <boost/scoped_ptr.hpp>
 
 #if defined(ASSIMP_UNIFIED_HEADER_NAMES)
-#include <assimp/scene.h>
-#include <assimp/LogStream.hpp>
-#include <assimp/DefaultLogger.hpp>
-#include <assimp/IOStream.hpp>
-#include <assimp/IOSystem.hpp>
-#include <assimp/Importer.hpp>
-#include <assimp/postprocess.h>
+#include <scene.h>
+#include <LogStream.hpp>
+#include <DefaultLogger.hpp>
+#include <IOStream.hpp>
+#include <IOSystem.hpp>
+#include <Importer.hpp>
+#include <postprocess.h>
 #else
 #include <assimp.hpp>
 #include <aiScene.h>
