--- source/creator/CMakeLists.txt	2011-07-24 19:00:59.130000280 -0600
+++ source/creator/CMakeLists.txt	2011-08-04 22:42:12.894000050 -0600
@@ -253,7 +253,7 @@
 		if(WITH_PYTHON_MODULE)
 			set(TARGETDIR_VER ${PYTHON_LIBPATH}/python${PYTHON_VERSION}/site-packages/${BLENDER_VERSION})
 		else()
-			set(TARGETDIR_VER ${CMAKE_INSTALL_PREFIX}/share/blender/${BLENDER_VERSION})
+			set(TARGETDIR_VER ${CMAKE_INSTALL_PREFIX}/share/blender-cycles/${BLENDER_VERSION})
 		endif()
 	endif()
 
@@ -304,6 +304,7 @@
 			install(
 				PROGRAMS ${TARGETDIR}/blender
 				DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
+				RENAME blender-cycles-bin
 			)
 		endif()
 
@@ -319,6 +320,7 @@
 		install(
 			FILES ${CMAKE_SOURCE_DIR}/release/freedesktop/blender.desktop
 			DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications
+			RENAME blender-cycles.desktop
 		)
 		install(
 			DIRECTORY
@@ -339,14 +341,16 @@
 		install(
 			PROGRAMS ${CMAKE_SOURCE_DIR}/release/bin/blender-thumbnailer.py
 			DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
+			RENAME blender-cycles-thumbnailer.py
 		)
 		install(
 			FILES ${CMAKE_SOURCE_DIR}/doc/manpage/blender.1
 			DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1
+			RENAME blender-cycles.1
 		)
 		install(
 			FILES ${BLENDER_TEXT_FILES}
-			DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/blender
+			DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/blender-cycles
 		)
 	endif()