diff --git a/cmake/GtsamCythonWrap.cmake b/cmake/GtsamCythonWrap.cmake
index 4894596f6..d785b4ef8 100644
--- a/cmake/GtsamCythonWrap.cmake
+++ b/cmake/GtsamCythonWrap.cmake
@@ -145,3 +145,30 @@ function(install_cython_scripts source_directory dest_directory patterns)
 
 endfunction()
 
+# Helper function to install specific files and handle multiple build types where the scripts
+# should be installed to all build type toolboxes
+#
+# Arguments:
+#  source_files: The source files to be installed. 
+#  dest_directory: The destination directory to install to.
+function(install_cython_files source_files dest_directory)
+
+	if(GTSAM_BUILD_TYPE_POSTFIXES)
+		foreach(build_type ${CMAKE_CONFIGURATION_TYPES})
+			string(TOUPPER "${build_type}" build_type_upper)
+			if(${build_type_upper} STREQUAL "RELEASE")
+				set(build_type_tag "") # Don't create release mode tag on installed directory
+			else()
+				set(build_type_tag "${build_type}")
+			endif()
+			# Split up filename to strip trailing '/' in GTSAM_CYTHON_INSTALL_PATH if there is one
+			get_filename_component(location "${dest_directory}" PATH)
+			get_filename_component(name "${dest_directory}" NAME)
+			install(FILES "${source_files}" DESTINATION "${location}/${name}${build_type_tag}")
+		endforeach()
+	else()
+		install(FILES "${source_files}" DESTINATION "${dest_directory}")
+	endif()
+
+endfunction()
+
diff --git a/cython/CMakeLists.txt b/cython/CMakeLists.txt
index 388e85fef..209c85f54 100644
--- a/cython/CMakeLists.txt
+++ b/cython/CMakeLists.txt
@@ -12,4 +12,4 @@ endif()
 configure_file(${CMAKE_SOURCE_DIR}/cython/gtsam/__init__.py.in ${PROJECT_BINARY_DIR}/cython/gtsam/__init__.py)
 
 # Install the custom-generated __init__.py
-install_cython_scripts("${PROJECT_BINARY_DIR}/cython/gtsam/" "${GTSAM_CYTHON_INSTALL_PATH}/gtsam" "__init__.py")
+install_cython_files("${PROJECT_BINARY_DIR}/cython/gtsam/__init__.py" "${GTSAM_CYTHON_INSTALL_PATH}/gtsam")