diff --git a/examples/OpenGL/CMakeLists.txt b/examples/OpenGL/CMakeLists.txt
index 74aa48d7..47a85505 100644
--- a/examples/OpenGL/CMakeLists.txt
+++ b/examples/OpenGL/CMakeLists.txt
@@ -56,15 +56,15 @@ LINK_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/../../library/PolyVoxCore/debug ${C
 ADD_EXECUTABLE(OpenGLExample ${SRC_FILES})
 TARGET_LINK_LIBRARIES(OpenGLExample ${QT_LIBRARIES} ${OPENGL_gl_LIBRARY} debug PolyVoxCore_d optimized PolyVoxCore)
 
-#Install
-INSTALL(TARGETS OpenGLExample
-	RUNTIME DESTINATION Examples/OpenGL/bin
-	LIBRARY DESTINATION Examples/OpenGL/lib
-	ARCHIVE DESTINATION Examples/OpenGL/lib
-	COMPONENT example
-)
-
+#Install - Only install the example in Windows
 IF(WIN32)
+	INSTALL(TARGETS OpenGLExample
+		RUNTIME DESTINATION Examples/OpenGL/bin
+		LIBRARY DESTINATION Examples/OpenGL/lib
+		ARCHIVE DESTINATION Examples/OpenGL/lib
+		COMPONENT example
+	)
+
 	INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/../../library/PolyVoxCore/release/PolyVoxCore.dll DESTINATION Examples/OpenGL/bin CONFIGURATIONS Release)
 	INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/../../library/PolyVoxUtil/release/PolyVoxUtil.dll DESTINATION Examples/OpenGL/bin CONFIGURATIONS Release)
 	
diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
index 39bf0239..041bad79 100644
--- a/library/CMakeLists.txt
+++ b/library/CMakeLists.txt
@@ -8,8 +8,16 @@ add_subdirectory(PolyVoxUtil)
 #Set up PolyVoxConfig.cmake
 if(WIN32)
 	set(CONFIG_FILE_DIR "CMake")
+	set(PolyVoxCore_LIBRARY_INSTALL_DIRS "PolyVoxCore/lib")
+	set(PolyVoxUtil_LIBRARY_INSTALL_DIRS "PolyVoxUtil/lib")
+	set(PolyVoxCore_INCLUDE_INSTALL_DIRS "PolyVoxCore/include")
+	set(PolyVoxUtil_INCLUDE_INSTALL_DIRS "PolyVoxUtil/include")
 else(WIN32)
 	set(CONFIG_FILE_DIR "share/PolyVox/cmake")
+	set(PolyVoxCore_LIBRARY_INSTALL_DIRS "lib")
+	set(PolyVoxUtil_LIBRARY_INSTALL_DIRS "lib")
+	set(PolyVoxCore_INCLUDE_INSTALL_DIRS "include/PolyVoxCore")
+	set(PolyVoxUtil_INCLUDE_INSTALL_DIRS "include/PolyVoxUtil")
 endif(WIN32)
 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/PolyVoxConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/PolyVoxConfig.cmake @ONLY)
@@ -17,8 +25,9 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PolyVoxConfig.cmake DESTINATION ${CONF
 
 find_package(Doxygen)
 if(DOXYGEN_FOUND)
+	#configure_file(${CMAKE_CURRENT_SOURCE_DIR}/polyvox.css ${CMAKE_CURRENT_BINARY_DIR}/polyvox.css)
 	configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
 	add_custom_target(doc COMMAND ${DOXYGEN_EXECUTABLE} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Building documentation" VERBATIM)
 endif()
 
-add_subdirectory(bindings)
+#add_subdirectory(bindings)
diff --git a/library/PolyVoxConfig.cmake.in b/library/PolyVoxConfig.cmake.in
index a7e92ca1..ca1bb1ba 100644
--- a/library/PolyVoxConfig.cmake.in
+++ b/library/PolyVoxConfig.cmake.in
@@ -14,8 +14,8 @@
 include(FindPackageMessage)
 
 set(PREFIX "@CMAKE_INSTALL_PREFIX@")
-set(PolyVox_LIBRARY_DIRS "${PREFIX}/PolyVoxCore/lib" "${PREFIX}/PolyVoxUtil/lib")
-set(PolyVox_INCLUDE_DIRS "${PREFIX}/PolyVoxCore/include" "${PREFIX}/PolyVoxUtil/include" "${PREFIX}/include")
+set(PolyVox_LIBRARY_DIRS "${PREFIX}/@PolyVoxCore_LIBRARY_INSTALL_DIRS@" "${PREFIX}/@PolyVoxUtil_LIBRARY_INSTALL_DIRS@")
+set(PolyVox_INCLUDE_DIRS "${PREFIX}/@PolyVoxCore_INCLUDE_INSTALL_DIRS@" "${PREFIX}/@PolyVoxCore_INCLUDE_INSTALL_DIRS@" "${PREFIX}/include")
 set(PolyVox_LIBRARIES "PolyVoxUtil" "PolyVoxCore")
 
 message(STATUS "Found PolyVox")
diff --git a/library/PolyVoxCore/CMakeLists.txt b/library/PolyVoxCore/CMakeLists.txt
index bf945f9a..4240c5c9 100644
--- a/library/PolyVoxCore/CMakeLists.txt
+++ b/library/PolyVoxCore/CMakeLists.txt
@@ -70,13 +70,25 @@ IF(WIN32)
 ENDIF(WIN32)
 
 #Install
-INSTALL(TARGETS PolyVoxCore
-	RUNTIME DESTINATION PolyVoxCore/bin
-	LIBRARY DESTINATION PolyVoxCore/lib
-	ARCHIVE DESTINATION PolyVoxCore/lib
-	COMPONENT library
-)
+IF(WIN32)
+	INSTALL(TARGETS PolyVoxCore
+		RUNTIME DESTINATION PolyVoxCore/bin
+		LIBRARY DESTINATION PolyVoxCore/lib
+		ARCHIVE DESTINATION PolyVoxCore/lib
+		COMPONENT library
+	)
 
-#Install the core header files, including the ones in the PolyVoxImpl subfolder.
-INSTALL(DIRECTORY include DESTINATION PolyVoxCore COMPONENT development PATTERN "*.svn*" EXCLUDE)
+	#Install the core header files, including the ones in the PolyVoxImpl subfolder.
+	INSTALL(DIRECTORY include DESTINATION PolyVoxCore COMPONENT development PATTERN "*.svn*" EXCLUDE)
+ELSE(WIN32)
+	INSTALL(TARGETS PolyVoxCore
+		RUNTIME DESTINATION bin
+		LIBRARY DESTINATION lib
+		ARCHIVE DESTINATION lib
+		COMPONENT library
+	)
+
+	#Install the core header files, including the ones in the PolyVoxImpl subfolder.
+	INSTALL(DIRECTORY include/ DESTINATION include/PolyVoxCore COMPONENT development PATTERN "*.svn*" EXCLUDE)
+ENDIF(WIN32)
 
diff --git a/library/PolyVoxUtil/CMakeLists.txt b/library/PolyVoxUtil/CMakeLists.txt
index f1e1e2ae..b3643661 100644
--- a/library/PolyVoxUtil/CMakeLists.txt
+++ b/library/PolyVoxUtil/CMakeLists.txt
@@ -40,12 +40,24 @@ IF(WIN32)
 ENDIF(WIN32)
 
 #Install
-INSTALL(TARGETS PolyVoxUtil
-	RUNTIME DESTINATION PolyVoxUtil/bin
-	LIBRARY DESTINATION PolyVoxUtil/lib
-	ARCHIVE DESTINATION PolyVoxUtil/lib
-	COMPONENT library
-)
+IF(WIN32)
+	INSTALL(TARGETS PolyVoxUtil
+		RUNTIME DESTINATION PolyVoxUtil/bin
+		LIBRARY DESTINATION PolyVoxUtil/lib
+		ARCHIVE DESTINATION PolyVoxUtil/lib
+		COMPONENT library
+	)
 
-#Install the util header files.
-INSTALL(DIRECTORY include DESTINATION PolyVoxUtil COMPONENT development PATTERN "*.svn*" EXCLUDE)
\ No newline at end of file
+	#Install the util header files.
+	INSTALL(DIRECTORY include DESTINATION PolyVoxUtil COMPONENT development PATTERN "*.svn*" EXCLUDE)
+ELSE(WIN32)
+	INSTALL(TARGETS PolyVoxUtil
+		RUNTIME DESTINATION bin
+		LIBRARY DESTINATION lib
+		ARCHIVE DESTINATION lib
+		COMPONENT library
+	)
+
+	#Install the core header files, including the ones in the PolyVoxImpl subfolder.
+	INSTALL(DIRECTORY include/ DESTINATION include/PolyVoxUtil COMPONENT development PATTERN "*.svn*" EXCLUDE)
+ENDIF(WIN32)
\ No newline at end of file