diff --git a/cmake/modules/InstallationHelper.cmake b/cmake/modules/InstallationHelper.cmake
index eeb366581..8ad7fac0d 100644
--- a/cmake/modules/InstallationHelper.cmake
+++ b/cmake/modules/InstallationHelper.cmake
@@ -1,155 +1,157 @@
 # This file contains facilities for installing the files.
 
 include(GNUInstallDirs)
 include(SanitizeHelper)
 
 function(_add_install_target COMPONENT)
 	sanitize_target_name("install-" "${COMPONENT}" INSTALL_TARGET)
 
 	if(NOT TARGET ${INSTALL_TARGET})
 		add_custom_target(${INSTALL_TARGET}
 			COMMENT "Installing component ${COMPONENT}"
 			COMMAND
 				"${CMAKE_COMMAND}"
 				-E env CMAKE_INSTALL_ALWAYS=ON
 				"${CMAKE_COMMAND}"
 				-DCOMPONENT="${COMPONENT}"
 				-DCMAKE_INSTALL_PREFIX="${CMAKE_INSTALL_PREFIX}"
 				-P cmake_install.cmake
 			WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
 		)
 
 		if(TARGET install-all)
 			add_dependencies(install-all ${INSTALL_TARGET})
 		endif()
 	endif()
 
 	# Other arguments are additional dependencies
 	if(ARGN)
 		add_dependencies(${INSTALL_TARGET} ${ARGN})
 	endif()
 
 	if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
 		if(NOT TARGET "install-${COMPONENT}-debug")
 			add_custom_target("install-${COMPONENT}-debug"
 				COMMENT "Splitting out the debug symbols for component ${COMPONENT}"
 				COMMAND
 					"${CMAKE_SOURCE_DIR}/cmake/utils/split-installed-component.sh"
 					"${CMAKE_BINARY_DIR}/contrib/devtools/split-debug.sh"
 					"${CMAKE_BINARY_DIR}/install_manifest_${COMPONENT}.txt"
+					"${CMAKE_INSTALL_BINDIR}"
+					"${CMAKE_INSTALL_LIBDIR}"
 				DEPENDS
 					"${INSTALL_TARGET}"
 					"${CMAKE_BINARY_DIR}/contrib/devtools/split-debug.sh"
 			)
 		endif()
 
 		if(TARGET install-debug)
 			add_dependencies(install-debug "install-${COMPONENT}-debug")
 		endif()
 	endif()
 endfunction()
 
 function(install_target _target)
 	cmake_parse_arguments(ARG
 		""
 		"COMPONENT"
 		""
 		${ARGN}
 	)
 
 	if(NOT ARG_COMPONENT)
 		set(ARG_COMPONENT ${PROJECT_NAME})
 	endif()
 
 	install(
 		TARGETS ${_target}
 		RUNTIME
 			DESTINATION "${CMAKE_INSTALL_BINDIR}"
 			COMPONENT ${ARG_COMPONENT}
 			${ARG_UNPARSED_ARGUMENTS}
 		ARCHIVE
 			DESTINATION "${CMAKE_INSTALL_LIBDIR}"
 			COMPONENT ${ARG_COMPONENT}
 			${ARG_UNPARSED_ARGUMENTS}
 		LIBRARY
 			DESTINATION "${CMAKE_INSTALL_LIBDIR}"
 			COMPONENT ${ARG_COMPONENT}
 			${ARG_UNPARSED_ARGUMENTS}
 		PUBLIC_HEADER
 			DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
 			COMPONENT ${ARG_COMPONENT}
 			${ARG_UNPARSED_ARGUMENTS}
 	)
 
 	_add_install_target("${ARG_COMPONENT}" ${_target})
 endfunction()
 
 function(install_shared_library NAME)
 	cmake_parse_arguments(ARG
 		"EXCLUDE_FROM_ALL"
 		""
 		"PUBLIC_HEADER"
 		${ARGN}
 	)
 
 	set(_sources ${ARG_UNPARSED_ARGUMENTS})
 
 	get_target_property(_target_type ${NAME} TYPE)
 	if(_target_type STREQUAL "SHARED_LIBRARY")
 		set(_shared_name "${NAME}")
 		target_sources(${NAME} PRIVATE ${_sources})
 	else()
 		set(_shared_name "${NAME}-shared")
 		add_library(${_shared_name} SHARED ${_sources})
 		target_link_libraries(${_shared_name} ${NAME})
 	endif()
 
 	if(ARG_PUBLIC_HEADER)
 		set_property(TARGET ${_shared_name} PROPERTY PUBLIC_HEADER ${ARG_PUBLIC_HEADER})
 	endif()
 
 	if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 		# FIXME For compatibility reason with autotools, the version is set
 		# to 0.0.0 (major being actually 0). This is obviously wrong and the
 		# version of the library should reflect the version of the release.
 		# On platforms other than linux, only the major version (0) is used.
 		# Replace the VERSION line with the statement below to set the
 		# correct version:
 		# set(_properties VERSION "${CMAKE_PROJECT_VERSION}")
 		list(APPEND _properties VERSION "${CMAKE_PROJECT_VERSION_MAJOR}.0.0")
 	else()
 		list(APPEND _properties VERSION "${CMAKE_PROJECT_VERSION_MAJOR}")
 	endif()
 
 	# For autotools compatibility, rename the library to ${OUTPUT_NAME}-0.dll
 	if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
 		list(APPEND _properties OUTPUT_NAME "${NAME}-${CMAKE_PROJECT_VERSION_MAJOR}")
 		# DLL_EXPORT is defined by libtool, and is expected by some sources.
 		target_compile_definitions(${_shared_name} PRIVATE DLL_EXPORT)
 	else()
 		list(APPEND _properties OUTPUT_NAME "${NAME}")
 	endif()
 
 	list(APPEND _properties SOVERSION "${CMAKE_PROJECT_VERSION_MAJOR}")
 
 	set_target_properties(${_shared_name} PROPERTIES ${_properties})
 
 	# Forward EXCLUDE_FROM_ALL if set
 	if(ARG_EXCLUDE_FROM_ALL)
 		set(FORWARD_EXCLUDE_FROM_ALL EXCLUDE_FROM_ALL)
 	endif()
 
 	install_target(${_shared_name} ${FORWARD_EXCLUDE_FROM_ALL})
 endfunction()
 
 function(install_manpages)
 	set(MAN_DESTINATION "${CMAKE_INSTALL_MANDIR}/man1")
 
 	install(
 		FILES ${ARGN}
 		DESTINATION "${MAN_DESTINATION}"
 		COMPONENT manpages
 	)
 
 	_add_install_target(manpages)
 endfunction()
diff --git a/cmake/utils/split-installed-component.sh b/cmake/utils/split-installed-component.sh
index 5d8746c7d..071ab48eb 100755
--- a/cmake/utils/split-installed-component.sh
+++ b/cmake/utils/split-installed-component.sh
@@ -1,15 +1,36 @@
 #!/bin/sh
 
 export LC_ALL=C.UTF-8
 
 SPLIT_SCRIPT="$1"
 INSTALL_MANIFEST="$2"
+shift 2
+
+should_strip() {
+  FILE="$1"
+  shift
+
+  if [ -L "${FILE}" ]
+  then
+    return 1
+  fi
+
+  for DIR in "$@"
+  do
+    if [ "$(basename $(dirname "${FILE}"))" = "${DIR}" ]
+    then
+      return 0
+    fi
+  done
+
+  return 2
+}
 
 while IFS= read -r FILE || [ -n "$FILE" ]
 do
-  if [ ! -L "${FILE}" ] && [ -x "${FILE}" ]
+  if should_strip "${FILE}" "$@"
   then
     echo "Splitting debug symbols out of ${FILE}"
     "${SPLIT_SCRIPT}" "${FILE}" "${FILE}" "${FILE}.dbg" > /dev/null 2>&1
   fi
 done < "${INSTALL_MANIFEST}"