diff --git a/Modules/FindTclsh.cmake b/Modules/FindTclsh.cmake
index ff0d0a588..9b7529b8a 100644
--- a/Modules/FindTclsh.cmake
+++ b/Modules/FindTclsh.cmake
@@ -20,9 +20,9 @@
 # (To distributed this file outside of CMake, substitute the full
 #  License text for the above reference.)
 
-IF(WIN32 AND UNIX)
+IF(CYGWIN)
   FIND_PROGRAM(TCL_TCLSH NAMES cygtclsh83 cygtclsh80)
-ENDIF(WIN32 AND UNIX)
+ENDIF(CYGWIN)
 
 GET_FILENAME_COMPONENT(TK_WISH_PATH "${TK_WISH}" PATH)
 GET_FILENAME_COMPONENT(TK_WISH_PATH_PARENT "${TK_WISH_PATH}" PATH)
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index 621ac3e27..8e3872bac 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -425,12 +425,12 @@ SET(CPACK_SRCS
   CPack/cmCPackZIPGenerator.cxx
   )
 
-IF(WIN32 AND UNIX)
+IF(CYGWIN)
   SET(CPACK_SRCS ${CPACK_SRCS}
     CPack/cmCPackCygwinBinaryGenerator.cxx
     CPack/cmCPackCygwinSourceGenerator.cxx
     )
-ENDIF(WIN32 AND UNIX)
+ENDIF(CYGWIN)
   
 IF(UNIX)
   SET(CPACK_SRCS ${CPACK_SRCS}