diff --git a/CMakeModules/FindFreeType.cmake b/CMakeModules/FindFreeType.cmake
index 747f89b26..e88fc09f9 100644
--- a/CMakeModules/FindFreeType.cmake
+++ b/CMakeModules/FindFreeType.cmake
@@ -34,6 +34,7 @@ FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build ft2build.h
 	/opt/local/include
 	/opt/csw/include
 	/opt/include
+	/usr/freeware/include/freetype2
 )
 
 FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h 
@@ -46,6 +47,7 @@ FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h
 	/opt/local/include/freetype2
 	/opt/csw/include/freetype2
 	/opt/include/freetype2
+	/usr/freeware/include/freetype2
 )
 
 FIND_LIBRARY(FREETYPE_LIBRARY 
@@ -61,6 +63,7 @@ FIND_LIBRARY(FREETYPE_LIBRARY
 	/opt/local/lib
 	/opt/csw/lib
 	/opt/lib
+	/usr/freeware/lib64
 )
 
 IF(FREETYPE_INCLUDE_DIR_ft2build AND FREETYPE_INCLUDE_DIR_freetype2)
diff --git a/CMakeModules/FindGIFLIB.cmake b/CMakeModules/FindGIFLIB.cmake
index c833a52ed..481d69248 100644
--- a/CMakeModules/FindGIFLIB.cmake
+++ b/CMakeModules/FindGIFLIB.cmake
@@ -25,6 +25,7 @@ FIND_PATH(GIFLIB_INCLUDE_DIR gif_lib.h
 	/opt/csw/include # Blastwave
 	/opt/include
 	[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include
+	/usr/freeware/include
 )
 
 FIND_LIBRARY(GIFLIB_LIBRARY 
@@ -44,6 +45,7 @@ FIND_LIBRARY(GIFLIB_LIBRARY
 	/opt/csw/lib
 	/opt/lib
 	[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib
+	/usr/freeware/lib64
 )
 
 SET(GIFLIB_FOUND "NO")
diff --git a/src/osgPlugins/jpeg/CMakeLists.txt b/src/osgPlugins/jpeg/CMakeLists.txt
index 0d672969e..ec56c1def 100644
--- a/src/osgPlugins/jpeg/CMakeLists.txt
+++ b/src/osgPlugins/jpeg/CMakeLists.txt
@@ -2,6 +2,6 @@ IF(MSVC)
  SET(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:MSVCRT")
 ENDIF(MSVC) 
 INCLUDE_DIRECTORIES( ${JPEG_INCLUDE_DIR} )
-LINK_DIRECTORIES( ${JPEG_DIR}/lib )
+#LINK_DIRECTORIES( ${JPEG_DIR}/lib )
 ADD_OSG_PLUGIN(jpeg ${JPEG_LIBRARY})
 
diff --git a/src/osgPlugins/tiff/CMakeLists.txt b/src/osgPlugins/tiff/CMakeLists.txt
index ca6432d55..0861c704b 100644
--- a/src/osgPlugins/tiff/CMakeLists.txt
+++ b/src/osgPlugins/tiff/CMakeLists.txt
@@ -1,8 +1,8 @@
 IF(NOT MINGW)
 INCLUDE_DIRECTORIES( ${TIFF_INCLUDE_DIR} )
-LINK_DIRECTORIES( ${TIFF_DIR}/lib )
+#LINK_DIRECTORIES( ${TIFF_DIR}/lib )
 ADD_OSG_PLUGIN(tiff ${TIFF_LIBRARY} ${JPEG_LIBRARY} ${ZLIB_LIBRARY}) 
 IF(MSVC)
 	SET_TARGET_PROPERTIES(osgdb_tiff PROPERTIES LINK_FLAGS_DEBUG "/NODEFAULTLIB:MSVCRT")
 ENDIF(MSVC)
-ENDIF(NOT MINGW)
\ No newline at end of file
+ENDIF(NOT MINGW)