diff --git a/shell_integration/CMakeLists.txt b/shell_integration/CMakeLists.txt
index cb8d80f69..c08efc962 100644
--- a/shell_integration/CMakeLists.txt
+++ b/shell_integration/CMakeLists.txt
@@ -1,2 +1,4 @@
 add_subdirectory(testclient)
 add_subdirectory(MacOSX)
+add_subdirectory(icons)
+
diff --git a/shell_integration/icons/CMakeLists.txt b/shell_integration/icons/CMakeLists.txt
new file mode 100644
index 000000000..3fb7c55ba
--- /dev/null
+++ b/shell_integration/icons/CMakeLists.txt
@@ -0,0 +1,9 @@
+
+# Install the Mac icon container into the Mac Bundle.
+if( BUILD_OWNCLOUD_OSX_BUNDLE AND NOT BUILD_LIBRARIES_ONLY )
+	set (ICON_DIR ${OWNCLOUD_OSX_BUNDLE}/Contents/Resources/icons)
+	
+	file(GLOB mac_icons "icns/*icns")
+	install(FILES ${mac_icons} DESTINATION ${ICON_DIR})
+endif()
+