--- 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(
 			DIRECTORY ${CMAKE_SOURCE_DIR}/release/text
-			DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/blender
+			DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/blender-cycles
 			PATTERN ".svn" EXCLUDE
 		)
 	endif()
--- intern/cycles/CMakeLists.txt	2011-07-24 18:58:15.195000275 -0600
+++ intern/cycles/CMakeLists.txt	2011-08-04 23:38:06.062000108 -0600
@@ -47,7 +47,7 @@
 	if(WITH_INSTALL_PORTABLE)
 		set(TARGETDIR_VER ${TARGETDIR}/${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()
 elseif(WIN32)
 	set(TARGETDIR_VER ${TARGETDIR}/${BLENDER_VERSION})
--- intern/cycles/blender/CMakeLists.txt	2011-07-24 18:58:13.775000273 -0600
+++ intern/cycles/blender/CMakeLists.txt	2011-08-05 00:12:14.846000113 -0600
@@ -89,21 +89,21 @@
 		DESTINATION ${CYCLES_INSTALL_PATH}/cycles)
 ENDIF()
 
-IF(UNIX AND NOT APPLE)
+#IF(UNIX AND NOT APPLE)
 	# copy libraries to cycles lib directory
-	SET(install_libs
-		${OPENIMAGEIO_LIBRARY}
-		${Boost_LIBRARIES}
-		${OSL_LIBRARIES}
-		${PARTIO_LIBRARIES})
+	#	SET(install_libs
+	#		${OPENIMAGEIO_LIBRARY}
+	#	${Boost_LIBRARIES}
+	#	${OSL_LIBRARIES}
+	#	${PARTIO_LIBRARIES})
 	
-	LIST(REMOVE_ITEM install_libs optimized)
-	LIST(REMOVE_ITEM install_libs debug)
+	#	LIST(REMOVE_ITEM install_libs optimized)
+	#	LIST(REMOVE_ITEM install_libs debug)
 
-	INSTALL(FILES ${install_libs}
-		DESTINATION ${CYCLES_INSTALL_PATH}/cycles/lib)
+	#	INSTALL(FILES ${install_libs}
+	#		DESTINATION ${CYCLES_INSTALL_PATH}/cycles/lib)
 	
 	# set path to look for dynamic libs
-	SET_TARGET_PROPERTIES(cycles_blender PROPERTIES INSTALL_RPATH $ORIGIN/lib)
-ENDIF()
+	#	SET_TARGET_PROPERTIES(cycles_blender PROPERTIES INSTALL_RPATH $ORIGIN/lib)
+	#ENDIF()