diff --git a/cmake/packaging.cmake b/cmake/packaging.cmake
index 23d764c5..223fbcf9 100644
--- a/cmake/packaging.cmake
+++ b/cmake/packaging.cmake
@@ -42,12 +42,15 @@ elseif ( APPLE )
 elseif ( LINUX )
     set (PACKDIR Linux)
 elseif ( CMAKE_SYSTEM_NAME STREQUAL "NetBSD" OR CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR CMAKE_HOST_SOLARIS)
-    set (PACKDIR ${CMAKE_SYSTEM_NAME})
+    set (PACKDIR Unix)
 else()
     set (PACKDIR Linux) # Linux and unsupported systems
 endif()
 
 set (BUNDLE_NAME ${PACKDIR})
+if ( CMAKE_SYSTEM_NAME STREQUAL "NetBSD" OR CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR CMAKE_HOST_SOLARIS )
+    set (BUNDLE_NAME ${CMAKE_SYSTEM_NAME})
+endif()
 
 set (CC "") # Compiler
 if ( NOT APPLE AND NOT CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" )