diff -Nru flwm-1.02+git2015.10.03+7dbb30/debian/changelog flwm-1.02+git2015.10.03+7dbb30/debian/changelog
--- flwm-1.02+git2015.10.03+7dbb30/debian/changelog	2017-12-30 04:10:19.000000000 +0000
+++ flwm-1.02+git2015.10.03+7dbb30/debian/changelog	2018-01-11 22:34:36.000000000 +0000
@@ -1,3 +1,10 @@
+flwm (1.02+git2015.10.03+7dbb30-6) unstable; urgency=high
+
+  * Fix generate-flwm-menu-from-desktop-files to handle non-existing
+    /usr/share/applications/ gracefully. (Closes: #886935)
+
+ -- Axel Beckert <abe@debian.org>  Thu, 11 Jan 2018 23:34:36 +0100
+
 flwm (1.02+git2015.10.03+7dbb30-5) unstable; urgency=medium
 
   * Fix File::DesktopEntry's package name also in package description.
diff -Nru flwm-1.02+git2015.10.03+7dbb30/debian/menu-stuff/generate-flwm-menu-from-desktop-files flwm-1.02+git2015.10.03+7dbb30/debian/menu-stuff/generate-flwm-menu-from-desktop-files
--- flwm-1.02+git2015.10.03+7dbb30/debian/menu-stuff/generate-flwm-menu-from-desktop-files	2017-12-23 01:52:18.000000000 +0000
+++ flwm-1.02+git2015.10.03+7dbb30/debian/menu-stuff/generate-flwm-menu-from-desktop-files	2018-01-11 22:29:23.000000000 +0000
@@ -2,7 +2,7 @@
 #
 # Script to generate an FLWM menu based on XDG .desktop files
 #
-# Copyright: 2017 Axel Beckert <abe@debian.org>
+# Copyright: 2017-2018 Axel Beckert <abe@debian.org>
 # License: GPL-2+
 # (See debian/copyright or /usr/share/doc/flwm/copyright for details.)
 
@@ -60,6 +60,9 @@
 $target_dir->remove_tree;
 $target_dir->mkpath;
 
+# Just exit gracefully if /usr/share/applications/ doesn't exist.
+exit(0) unless $desktop_dir->exists;
+
 # Get all .desktop files
 my @desktop_files = $desktop_dir->children( qr{ \.desktop $ }x );