diff --git a/.travis/travis_build.sh b/.travis/travis_build.sh
index f89cdabe..186f1b93 100755
--- a/.travis/travis_build.sh
+++ b/.travis/travis_build.sh
@@ -37,6 +37,6 @@ make -j ${JOBS} || exit 3
 # Build the package on Linux
 if [[ $TRAVIS_OS_NAME == 'linux' ]]
 then
-    make -j ${JOBS} package || exit 4
+	make -j ${JOBS} package || exit 4
 fi
 
diff --git a/cmake/macos/Hyperion.icns b/cmake/macos/Hyperion.icns
new file mode 100644
index 00000000..784cdcc0
Binary files /dev/null and b/cmake/macos/Hyperion.icns differ
diff --git a/cmake/macos/Info.plist b/cmake/macos/Info.plist
new file mode 100644
index 00000000..2adbbe7b
--- /dev/null
+++ b/cmake/macos/Info.plist
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>CFBundleVersion</key>
+    <string>1489366340</string>
+    <key>CFBundleSignature</key>
+    <string>????</string>
+
+    <key>CFBundlePackageType</key>
+    <string>APPL</string>
+    <key>CFBundleInfoDictionaryVersion</key>
+    <string>6.0</string>
+
+    <key>CFBundleExecutable</key>
+    <string>hyperiond</string>
+    <key>CFBundleIconFile</key>
+    <string>Hyperion.icns</string>
+
+    <key>CFBundleIdentifier</key>
+    <string>com.hyperion-project.Hyperion</string>
+    <key>CFBundleName</key>
+    <string>Hyperion</string>
+    <key>CFBundleShortVersionString</key>
+    <string>2.0</string>
+
+    <key>BuildMachineOSBuild</key>
+    <string>11G63</string>
+    <key>CFBundleDevelopmentRegion</key>
+    <string>en</string>
+
+    <key>DTCompiler</key>
+    <string></string>
+    <key>DTPlatformBuild</key>
+    <string>4H1003</string>
+    <key>DTPlatformVersion</key>
+    <string>GM</string>
+    <key>DTSDKBuild</key>
+    <string>12D75</string>
+    <key>DTSDKName</key>
+    <string>macosx10.8</string>
+    <key>DTXcode</key>
+    <string>0462</string>
+    <key>DTXcodeBuild</key>
+    <string>4H1003</string>
+
+    <key>LSApplicationCategoryType</key>
+    <string>public.app-category.utilities</string>
+    <key>LSMinimumSystemVersion</key>
+    <string>10.6</string>
+
+    <key>NSHumanReadableCopyright</key>
+    <string>Copyright © 2017 Hyperion team. All rights reserved.</string>
+    <!--key>NSMainNibFile</key>
+    <string>MainMenu</string-->
+    <key>NSPrincipalClass</key>
+    <string>NSApplication</string>
+    <key>NSHighResolutionCapable</key>
+    <true/>
+
+    <key>SUEnableAutomaticChecks</key>
+    <true/>
+    <key>SUEnableSystemProfiling</key>
+    <false/>
+    <key>SUShowReleaseNotes</key>
+    <true/>
+    <key>SUAllowsAutomaticUpdates</key>
+    <true/>
+</dict>
+</plist>
diff --git a/cmake/packages.cmake b/cmake/packages.cmake
index 92ad79d8..ed1d6976 100644
--- a/cmake/packages.cmake
+++ b/cmake/packages.cmake
@@ -1,6 +1,10 @@
 # cmake file for generating distribution packages
 
-SET ( CPACK_GENERATOR "DEB" "TGZ" "STGZ" ) # "RPM" 
+IF (APPLE)
+	SET ( CPACK_GENERATOR "TGZ" "Bundle") # "RPM"
+ELSE()
+	SET ( CPACK_GENERATOR "DEB" "TGZ" "STGZ") # "RPM"
+ENDIF()
 
 SET ( CPACK_PACKAGE_NAME "hyperion" )
 SET ( CPACK_PACKAGE_DESCRIPTION_SUMMARY "Hyperion is an open source ambient light implementation" )
@@ -15,9 +19,16 @@ SET ( CPACK_DEBIAN_PACKAGE_DEPENDS "libqt5core5a (>= 5.2.0), libqt5network5 (>=
 SET ( CPACK_DEBIAN_PACKAGE_SECTION "Miscellaneous" )
 
 SET ( CPACK_RPM_PACKAGE_NAME "Hyperion" )
-SET ( CPACK_RPM_PACKAGE_URL "https://github.com/hyperion-project/hyperion" )
+SET ( CPACK_RPM_PACKAGE_URL "https://github.com/hyperion-project/hyperion.ng" )
 SET ( CPACK_RPM_POST_INSTALL_SCRIPT_FILE "${CMAKE_CURRENT_SOURCE_DIR}/cmake/rpm/postinst" )
 
+SET ( CPACK_PACKAGE_FILE_NAME "Hyperion")
+SET ( CPACK_PACKAGE_ICON ${CMAKE_CURRENT_SOURCE_DIR}/cmake/macos/Hyperion.icns )
+SET ( CPACK_BUNDLE_NAME "Hyperion" )
+SET ( CPACK_BUNDLE_ICON ${CMAKE_CURRENT_SOURCE_DIR}/cmake/macos/Hyperion.icns )
+SET ( CPACK_BUNDLE_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/cmake/macos/Info.plist )
+#SET ( CPACK_BUNDLE_STARTUP_COMMAND - path to a file that will be executed when the user opens the bundle. Could be a shell-script or a binary. )
+
 SET(CPACK_PACKAGE_VERSION_MAJOR "${HYPERION_VERSION_MAJOR}")
 SET(CPACK_PACKAGE_VERSION_MINOR "${HYPERION_VERSION_MINOR}")
 SET(CPACK_PACKAGE_VERSION_PATCH "${HYPERION_VERSION_PATCH}")