diff --git a/Modules/Platform/SunOS.cmake b/Modules/Platform/SunOS.cmake
index 58398c06f7ab5cb2c68d37689dddaf456577b9c8..e19e89a27d1e498efbd42cdbe6dc3a1a529e1c0c 100644
--- a/Modules/Platform/SunOS.cmake
+++ b/Modules/Platform/SunOS.cmake
@@ -9,6 +9,11 @@ endif()
 
 include(Platform/UnixPaths)
 
+list(APPEND CMAKE_SYSTEM_PREFIX_PATH
+  /opt/csw
+  /opt/openwin
+  )
+
 # The Sun linker needs to find transitive shared library dependencies
 # in the -L path.
 set(CMAKE_LINK_DEPENDENT_LIBRARY_DIRS 1)
diff --git a/Modules/Platform/UnixPaths.cmake b/Modules/Platform/UnixPaths.cmake
index 11b28f83743637ae220c34c257a2391debfe18af..48bbd40c4ad816a3b5dd34b75e7244358c7188ca 100644
--- a/Modules/Platform/UnixPaths.cmake
+++ b/Modules/Platform/UnixPaths.cmake
@@ -45,9 +45,7 @@ endif()
 list(APPEND CMAKE_SYSTEM_PREFIX_PATH
   /usr/X11R6
   /usr/pkg
-  /opt/csw
   /opt
-  /opt/openwin
   )
 
 # List common include file locations not under the common prefixes.