diff --git a/cmake/packaging.cmake b/cmake/packaging.cmake
index d4716f90..54865204 100644
--- a/cmake/packaging.cmake
+++ b/cmake/packaging.cmake
@@ -15,9 +15,23 @@ if ( MINGW OR MSYS )
     set (PACKDIR MinGW)
 elseif ( MSVC )
     set (PACKNAME MSVC)
-    set (PACKDIR  MSVC)
-elseif ( APPLE OR LINUX OR CYGWIN )
-    set (PACKNAME ${CMAKE_SYSTEM_NAME}) # Darwin or Linux or CYGWIN
+    set (PACKDIR  msvc)
+elseif ( CYGWIN )
+    if ( CMAKE_SIZEOF_VOID_P EQUAL 8 )
+        set (PACKNAME CYGWIN64)
+    else()
+        set (PACKNAME CYGWIN32)
+    endif()
+    set (PACKDIR CYGWIN)
+elseif ( LINUX )
+    if ( CMAKE_SIZEOF_VOID_P EQUAL 8 )
+        set (PACKNAME Linux)
+    else()
+        set (PACKNAME Linux32)
+    endif()
+    set (PACKDIR Linux)
+elseif ( APPLE )
+    set (PACKNAME ${CMAKE_SYSTEM_NAME})
     set (PACKDIR  ${PACKNAME})
 else()
     set (PACKNAME Linux      ) # unsupported systems such as FreeBSD