diff -Nru ignition-rendering-6.1.0+ds/debian/changelog ignition-rendering-6.1.0+ds/debian/changelog
--- ignition-rendering-6.1.0+ds/debian/changelog	2021-12-25 22:39:03.000000000 +0000
+++ ignition-rendering-6.1.0+ds/debian/changelog	2022-04-04 21:20:46.000000000 +0000
@@ -1,4 +1,11 @@
-ignition-rendering (6.1.0+ds-0ubuntu1) jammy; urgency=medium
+ignition-rendering (6.1.0+ds-0ubuntu2) jammy; urgency=medium
+
+  * Inject OGRE2_RESOURCE_PATH to solve problems with ogre-next pkg-config files
+  * Fix the patch for a complete linking with ogre-next libraries
+
+ -- Jose Luis Rivero <jrivero@osrfoundation.org>  Mon, 04 Apr 2022 23:20:46 +0200
+
+ignition-rendering (6.1.0+ds-0ubuntu1) jammy; urgency=medium
 
   * Initial import (LP: #1960260)
 
diff -Nru ignition-rendering-6.1.0+ds/debian/patches/0003-use-ogre-next-debian.patch ignition-rendering-6.1.0+ds/debian/patches/0003-use-ogre-next-debian.patch
--- ignition-rendering-6.1.0+ds/debian/patches/0003-use-ogre-next-debian.patch	2021-12-25 22:39:03.000000000 +0000
+++ ignition-rendering-6.1.0+ds/debian/patches/0003-use-ogre-next-debian.patch	2022-04-04 21:20:46.000000000 +0000
@@ -1,8 +1,6 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 668aa49..bebd089 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -92,12 +92,8 @@ endif()
+@@ -92,12 +92,8 @@
  
  #--------------------------------------
  # Find OGRE2
@@ -17,11 +15,9 @@
    set(HAVE_OGRE2 TRUE)
  endif()
  
-diff --git a/ogre2/src/CMakeLists.txt b/ogre2/src/CMakeLists.txt
-index bd3975c..f03a562 100644
 --- a/ogre2/src/CMakeLists.txt
 +++ b/ogre2/src/CMakeLists.txt
-@@ -28,8 +28,12 @@ set_property(
+@@ -28,8 +28,12 @@
  )
  
  target_include_directories(${ogre2_target}
@@ -35,20 +31,21 @@
  )
  
  target_link_libraries(${ogre2_target}
-@@ -39,7 +43,7 @@ target_link_libraries(${ogre2_target}
+@@ -39,7 +43,10 @@
      ignition-plugin${IGN_PLUGIN_VER}::register
      ${OPENGL_LIBRARIES}
      terra
 -    IgnOGRE2::IgnOGRE2)
-+    ${OGRE-Next_LIBRARIES})
++    ${OGRE-Next_LIBRARIES}
++    ${OGRE-Next_HlmsPbs_LIBRARIES}
++    ${OGRE-Next_HlmsUnlit_LIBRARIES}
++    ${OGRE-Next_Overlay_LIBRARIES})
  
  set (versioned ${CMAKE_SHARED_LIBRARY_PREFIX}${PROJECT_NAME_LOWER}-${engine_name}${CMAKE_SHARED_LIBRARY_SUFFIX})
  set (unversioned ${CMAKE_SHARED_LIBRARY_PREFIX}${PROJECT_NAME_NO_VERSION_LOWER}-${engine_name}${CMAKE_SHARED_LIBRARY_SUFFIX})
-diff --git a/ogre2/src/terrain/Terra/CMakeLists.txt b/ogre2/src/terrain/Terra/CMakeLists.txt
-index 83c9ac9..5c8e5ad 100644
 --- a/ogre2/src/terrain/Terra/CMakeLists.txt
 +++ b/ogre2/src/terrain/Terra/CMakeLists.txt
-@@ -32,10 +32,14 @@ target_include_directories(${PROJECT_NAME}
+@@ -32,10 +32,14 @@
    PRIVATE
      # Hlms files inside Hlms/Pbs do not have #include <Hlms/Pbs/...> thus
      # we must add this one manually for this to build correctly
diff -Nru ignition-rendering-6.1.0+ds/debian/rules ignition-rendering-6.1.0+ds/debian/rules
--- ignition-rendering-6.1.0+ds/debian/rules	2021-12-25 22:39:03.000000000 +0000
+++ ignition-rendering-6.1.0+ds/debian/rules	2022-04-04 21:18:19.000000000 +0000
@@ -12,8 +12,11 @@
 %:
 	dh $@
 
+# OGRE2_RESOURCE_PAHT is buggy in ogre-next 2.2.5+dfsg3-0ubuntu2. Workaround
+# here is to inject the path directly via CMake
 override_dh_auto_configure:
 	dh_auto_configure -- \
+	-DOGRE2_RESOURCE_PATH=/usr/lib/$(DEB_HOST_MULTIARCH)/OGRE-Next \
 	-DSKIP_optix=true $(EXTRA_CMAKE_FLAGS)
 
 override_dh_install: