diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1971c268f..0c8ebf347 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -844,3 +844,6 @@ if(CCACHE_FOUND)
         set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
         set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
 endif(CCACHE_FOUND)
+
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/misc/zoneminder.desktop DESTINATION share/applications)
+install(DIRECTORY icons DESTINATION "${CMAKE_INSTALL_DATADIR}/zoneminder/")
diff --git a/distros/ubuntu1604/zoneminder.install b/distros/ubuntu1604/zoneminder.install
index 8a26777c0..b0b1ad5b6 100644
--- a/distros/ubuntu1604/zoneminder.install
+++ b/distros/ubuntu1604/zoneminder.install
@@ -3,6 +3,7 @@ usr/bin
 usr/lib/zoneminder
 usr/share/polkit-1
 usr/share/zoneminder/db
+usr/share/zoneminder/icons
 usr/share/zoneminder/www
 
 # libzoneminder-perl files:
diff --git a/distros/ubuntu1604/zoneminder.menu b/distros/ubuntu1604/zoneminder.menu
new file mode 100644
index 000000000..fa3f3ff36
--- /dev/null
+++ b/distros/ubuntu1604/zoneminder.menu
@@ -0,0 +1,2 @@
+?package(zoneminder):needs="x11" section="Applications/Video" title="ZoneMinder" command="/usr/bin/x-www-browser http://localhost/zm" icon="/usr/share/zoneminder/icons/16x16/icon.xpm"
+
diff --git a/icons/16x16/icon.xpm b/icons/16x16/icon.xpm
new file mode 100644
index 000000000..69c4333f6
--- /dev/null
+++ b/icons/16x16/icon.xpm
@@ -0,0 +1,22 @@
+/* XPM */
+static char * favicon_xpm[] = {
+"16 16 3 1",
+" 	c None",
+".	c #000080",
+"+	c #C0C0C0",
+"................",
+"................",
+"++++++++++++++++",
+".......+..++++..",
+".......+...++...",
+"++++...+...++...",
+"+++....+........",
+"++....++........",
+"+....+++........",
+"....++++........",
+"...+++++..+..+..",
+".......+..+..+..",
+".......+..++++..",
+"++++++++++++++++",
+"................",
+"................"};
diff --git a/misc/zoneminder.desktop b/misc/zoneminder.desktop
new file mode 100755
index 000000000..f4c359a10
--- /dev/null
+++ b/misc/zoneminder.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Version=1.0
+Type=Link
+Name=ZoneMinder
+Comment=
+Icon=/usr/share/zoneminder/www/graphics/favicon.ico
+URL=http://localhost/zm/\r
+Categories=GNOME;AudioVideo;Video;Recorder;