diff --git a/manifest.xml b/manifest.xml
index 3282231..595b092 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -11,7 +11,7 @@
   <depend package="base/cmake" />
   <depend package="rtt" />
   <depend package="rtt_typelib" />
-  <depend package="tools/backward" />
+  <depend package="tools/backward-cpp" />
   <depend package="tools/orocos_cpp_base" />
   <depend package="tools/logger" />
   <depend package="tools/lib_config" />
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f90631d..ea0978c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -35,11 +35,15 @@ rock_library(orocos_cpp
         orocos-rtt-corba-${OROCOS_TARGET}
         typelib
         lib_config
-        backward
     DEPS_PLAIN 
         Boost_SYSTEM Boost_FILESYSTEM Boost_REGEX Boost_THREAD
     )
 
+find_package(Backward)
+if(Backward_FOUND)
+    target_link_libraries(orocos_cpp PUBLIC Backward::Backward)
+endif()
+
 rock_executable(listAll Main.cpp
     DEPS orocos_cpp
     NOINSTALL)
diff --git a/src/Spawner.cpp b/src/Spawner.cpp
index 2965644..7639bbb 100644
--- a/src/Spawner.cpp
+++ b/src/Spawner.cpp
@@ -16,7 +16,7 @@
 #include "CorbaNameService.hpp"
 #include <lib_config/Bundle.hpp>
 #include <signal.h>
-#include <backward/backward.hpp>
+#include <backward.hpp>
 #include <rtt/transports/corba/TaskContextProxy.hpp>
 
 using namespace orocos_cpp;