diff --git a/CMakeLists.txt b/CMakeLists.txt
index 33adb31..51f1253 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.4.0)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0)
 PROJECT(NV)
 ENABLE_TESTING()
 
@@ -16,6 +16,13 @@ MESSAGE(STATUS "Setting optimal options")
 MESSAGE(STATUS "  Processor: ${NV_SYSTEM_PROCESSOR}")
 MESSAGE(STATUS "  Compiler Flags: ${CMAKE_CXX_FLAGS}")
 
+IF(NVTT_SHARED)
+	SET(NVCORE_SHARED TRUE)
+	SET(NVMATH_SHARED TRUE)
+	SET(NVIMAGE_SHARED TRUE)
+ENDIF(NVTT_SHARED)
+
+
 ADD_SUBDIRECTORY(src)
 
 IF(WIN32)
diff --git a/ChangeLog b/ChangeLog
index f6dee57..f09e57d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@ NVIDIA Texture Tools version 2.0.5
  * Fix error in single color compressor. Fixes issue 66.
  * Detect mismatch between CUDA runtime and driver, and disable CUDA in that case.
  * Fix cmake files when compiling NVTT as a shared library.
+ * When linking nvtt dynamically on unix, link all libraries dynamically.
+ * Merge fixes from trunk.
 
 NVIDIA Texture Tools version 2.0.4
  * Fix error in RGB format output; reported by jonsoh. See issue 49.
diff --git a/src/nvcore/CMakeLists.txt b/src/nvcore/CMakeLists.txt
index 435f907..60ad1d9 100644
--- a/src/nvcore/CMakeLists.txt
+++ b/src/nvcore/CMakeLists.txt
@@ -28,6 +28,10 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 # targets
 ADD_DEFINITIONS(-DNVCORE_EXPORTS)
 
+IF(UNIX)
+	SET(LIBS ${LIBS} ${CMAKE_DL_LIBS})
+ENDIF(UNIX)
+
 IF(NVCORE_SHARED)
 	ADD_LIBRARY(nvcore SHARED ${CORE_SRCS})
 ELSE(NVCORE_SHARED)