diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index 872370a..55caf25 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -183,6 +183,9 @@ MACRO (CMAKE_BUILD_UTILITIES)
   SET(KWSYS_USE_CommandLineArguments 1)
   SET(KWSYS_HEADER_ROOT ${CMake_BINARY_DIR}/Source)
   SET(KWSYS_INSTALL_DOC_DIR "${CMake_DOC_DEST}")
+  IF(BUILD_SHARED_LIBS)
+    SET(KWSYS_INSTALL_LIB_DIR lib)
+  ENDIF(BUILD_SHARED_LIBS)
   SUBDIRS(Source/kwsys)
   
   #---------------------------------------------------------------------
@@ -409,13 +412,17 @@ ENDIF(BUILD_QtDialog)
 # The executables are then built with the RPATH for the libraries outside
 # the build tree, which is both the build and the install RPATH.
 IF (UNIX)
-  IF(   CMAKE_USE_SYSTEM_CURL   OR  CMAKE_USE_SYSTEM_ZLIB
+  IF(BUILD_SHARED_LIBS)
+    SET(CMAKE_SKIP_RPATH OFF CACHE INTERNAL "CMake built with RPATH.")
+    SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+    SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
+    SET(SKIP_BUILD_RPATH FALSE)
+  ELSEIF(   CMAKE_USE_SYSTEM_CURL   OR  CMAKE_USE_SYSTEM_ZLIB
         OR  CMAKE_USE_SYSTEM_EXPAT  OR  CTEST_USE_XMLRPC  OR  CURSES_NEED_RPATH  OR  QT_NEED_RPATH)
     SET(CMAKE_SKIP_RPATH OFF CACHE INTERNAL "CMake built with RPATH.")
     SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
     SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
-  ENDIF(CMAKE_USE_SYSTEM_CURL   OR  CMAKE_USE_SYSTEM_ZLIB
-        OR  CMAKE_USE_SYSTEM_EXPAT  OR  CTEST_USE_XMLRPC  OR  CURSES_NEED_RPATH  OR  QT_NEED_RPATH)
+  ENDIF(BUILD_SHARED_LIBS)
 ENDIF (UNIX)
 
 
diff --git a/cmake/Source/CMakeLists.txt b/cmake/Source/CMakeLists.txt
index 9099691..077aba7 100644
--- a/cmake/Source/CMakeLists.txt
+++ b/cmake/Source/CMakeLists.txt
@@ -496,6 +496,11 @@ INSTALL_TARGETS(/bin cpack)
 IF(APPLE)
   INSTALL_TARGETS(/bin cmakexbuild)
 ENDIF(APPLE)
+IF(BUILD_SHARED_LIBS)
+  INSTALL_TARGETS(/lib CMakeLib)
+  INSTALL_TARGETS(/lib CPackLib)
+  INSTALL_TARGETS(/lib CTestLib)
+ENDIF(BUILD_SHARED_LIBS)
 
 INSTALL_FILES(${CMAKE_DATA_DIR}/include cmCPluginAPI.h)
 
diff --git a/cmake/Source/CursesDialog/form/CMakeLists.txt b/cmake/Source/CursesDialog/form/CMakeLists.txt
index 2435f39..297cc11 100644
--- a/cmake/Source/CursesDialog/form/CMakeLists.txt
+++ b/cmake/Source/CursesDialog/form/CMakeLists.txt
@@ -64,3 +64,6 @@ TARGET_LINK_LIBRARIES(cmForm ${CURSES_LIBRARY})
 IF(CURSES_EXTRA_LIBRARY)
   TARGET_LINK_LIBRARIES(cmForm ${CURSES_EXTRA_LIBRARY})
 ENDIF(CURSES_EXTRA_LIBRARY)
+IF(BUILD_SHARED_LIBS)
+  INSTALL_TARGETS(/lib cmForm)
+ENDIF(BUILD_SHARED_LIBS)
diff --git a/cmake/Utilities/cmcompress/CMakeLists.txt b/cmake/Utilities/cmcompress/CMakeLists.txt
index 3323dcd..606e704 100644
--- a/cmake/Utilities/cmcompress/CMakeLists.txt
+++ b/cmake/Utilities/cmcompress/CMakeLists.txt
@@ -3,3 +3,6 @@ PROJECT(CMCompress)
 ADD_LIBRARY(cmcompress cmcompress.c)
 
 INSTALL(FILES Copyright.txt DESTINATION ${CMake_DOC_DEST}/cmcompress)
+IF(BUILD_SHARED_LIBS)
+  INSTALL_TARGETS(/lib cmcompress)
+ENDIF(BUILD_SHARED_LIBS)
diff --git a/cmake/Utilities/cmcurl/CMakeLists.txt b/cmake/Utilities/cmcurl/CMakeLists.txt
index e2c64db..63c387e 100644
--- a/cmake/Utilities/cmcurl/CMakeLists.txt
+++ b/cmake/Utilities/cmcurl/CMakeLists.txt
@@ -747,3 +747,6 @@ ADD_EXECUTABLE(LIBCURL Testing/curltest.c)
 TARGET_LINK_LIBRARIES(LIBCURL cmcurl ${CMAKE_DL_LIBS})
 ADD_TEST(curl "${EXECUTABLE_OUTPUT_PATH}/LIBCURL")
 INSTALL(FILES COPYING DESTINATION ${CMake_DOC_DEST}/cmcurl)
+IF(BUILD_SHARED_LIBS)
+  INSTALL_TARGETS(/lib cmcurl)
+ENDIF(BUILD_SHARED_LIBS)
diff --git a/cmake/Utilities/cmexpat/CMakeLists.txt b/cmake/Utilities/cmexpat/CMakeLists.txt
index 7dd8329..6d7294d 100644
--- a/cmake/Utilities/cmexpat/CMakeLists.txt
+++ b/cmake/Utilities/cmexpat/CMakeLists.txt
@@ -33,3 +33,6 @@ CONFIGURE_FILE(${CMEXPAT_SOURCE_DIR}/expat.h
 
 ADD_LIBRARY(cmexpat ${expat_SRCS})
 INSTALL(FILES COPYING DESTINATION ${CMake_DOC_DEST}/cmexpat)
+IF(BUILD_SHARED_LIBS)
+  INSTALL_TARGETS(/lib cmexpat)
+ENDIF(BUILD_SHARED_LIBS)
diff --git a/cmake/Utilities/cmtar/CMakeLists.txt b/cmake/Utilities/cmtar/CMakeLists.txt
index 8b03a17..ad11e39 100644
--- a/cmake/Utilities/cmtar/CMakeLists.txt
+++ b/cmake/Utilities/cmtar/CMakeLists.txt
@@ -389,8 +389,11 @@ INCLUDE_DIRECTORIES(${CMTAR_ZLIB_INCLUDE_DIRS})
 CONFIGURE_FILE(${LIBTAR_SOURCE_DIR}/config.h.in
   ${LIBTAR_BINARY_DIR}/libtar/config.h)
 
-ADD_LIBRARY(cmtar STATIC ${libtar_SRC})
+ADD_LIBRARY(cmtar ${libtar_SRC})
 ADD_EXECUTABLE(tartest libtar.c)
 TARGET_LINK_LIBRARIES(tartest cmtar ${CMTAR_ZLIB_LIBRARIES})
 
 INSTALL(FILES COPYRIGHT DESTINATION ${CMake_DOC_DEST}/cmtar)
+IF(BUILD_SHARED_LIBS)
+  INSTALL_TARGETS(/lib cmtar)
+ENDIF(BUILD_SHARED_LIBS)
diff --git a/cmake/Utilities/cmzlib/CMakeLists.txt b/cmake/Utilities/cmzlib/CMakeLists.txt
index 5ee43e3..c91aeb6 100644
--- a/cmake/Utilities/cmzlib/CMakeLists.txt
+++ b/cmake/Utilities/cmzlib/CMakeLists.txt
@@ -44,3 +44,6 @@ ENDFOREACH(name)
 ADD_LIBRARY(cmzlib ${ZLIB_SRCS})
 
 INSTALL(FILES Copyright.txt DESTINATION ${CMake_DOC_DEST}/cmzlib)
+IF(BUILD_SHARED_LIBS)
+  INSTALL_TARGETS(/lib cmzlib)
+ENDIF(BUILD_SHARED_LIBS)