diff --git a/NEWS b/NEWS
index 23b0783..75129ee 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+3.18.3
+======
+* apps-menu: Fix .desktop entries in subdirectories
+
 3.18.2
 ======
 * Fix classic style issues
diff --git a/configure b/configure
index f681dff..78df5ea 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for gnome-shell-extensions 3.18.2.
+# Generated by GNU Autoconf 2.69 for gnome-shell-extensions 3.18.3.
 #
 # Report bugs to <https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell&component=extensions>.
 #
@@ -580,8 +580,8 @@
 # Identity of this package.
 PACKAGE_NAME='gnome-shell-extensions'
 PACKAGE_TARNAME='gnome-shell-extensions'
-PACKAGE_VERSION='3.18.2'
-PACKAGE_STRING='gnome-shell-extensions 3.18.2'
+PACKAGE_VERSION='3.18.3'
+PACKAGE_STRING='gnome-shell-extensions 3.18.3'
 PACKAGE_BUGREPORT='https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell&component=extensions'
 PACKAGE_URL=''
 
@@ -1257,7 +1257,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures gnome-shell-extensions 3.18.2 to adapt to many kinds of systems.
+\`configure' configures gnome-shell-extensions 3.18.3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1324,7 +1324,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of gnome-shell-extensions 3.18.2:";;
+     short | recursive ) echo "Configuration of gnome-shell-extensions 3.18.3:";;
    esac
   cat <<\_ACEOF
 
@@ -1420,7 +1420,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-gnome-shell-extensions configure 3.18.2
+gnome-shell-extensions configure 3.18.3
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1437,7 +1437,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by gnome-shell-extensions $as_me 3.18.2, which was
+It was created by gnome-shell-extensions $as_me 3.18.3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2303,7 +2303,7 @@
 
 # Define the identity of the package.
  PACKAGE='gnome-shell-extensions'
- VERSION='3.18.2'
+ VERSION='3.18.3'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -4122,7 +4122,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by gnome-shell-extensions $as_me 3.18.2, which was
+This file was extended by gnome-shell-extensions $as_me 3.18.3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -4179,7 +4179,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-gnome-shell-extensions config.status 3.18.2
+gnome-shell-extensions config.status 3.18.3
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index d64bc12..156a946 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.63)
-AC_INIT([gnome-shell-extensions],[3.18.2],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell&component=extensions])
+AC_INIT([gnome-shell-extensions],[3.18.3],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell&component=extensions])
 
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([config])
diff --git a/debian/changelog b/debian/changelog
index ca27c32..54851a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gnome-shell-extensions (3.18.3-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Michael Biebl <biebl@debian.org>  Thu, 14 Jan 2016 22:49:16 +0100
+
 gnome-shell-extensions (3.18.2-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/extensions/apps-menu/extension.js b/extensions/apps-menu/extension.js
index 3180f3a..796d235 100644
--- a/extensions/apps-menu/extension.js
+++ b/extensions/apps-menu/extension.js
@@ -397,18 +397,15 @@
         while ((nextType = iter.next()) != GMenu.TreeItemType.INVALID) {
             if (nextType == GMenu.TreeItemType.ENTRY) {
                 let entry = iter.get_entry();
-                let appInfo = entry.get_app_info();
                 let id;
                 try {
-                    id = appInfo.get_id(); // catch non-UTF8 filenames
+                    id = entry.get_desktop_file_id(); // catch non-UTF8 filenames
                 } catch(e) {
                     continue;
                 }
                 let app = appSys.lookup_app(id);
-                if (appInfo.should_show()) {
-                    let menu_id = dir.get_menu_id();
+                if (app.get_app_info().should_show())
                     this.applicationsByCategory[categoryId].push(app);
-                }
             } else if (nextType == GMenu.TreeItemType.DIRECTORY) {
                 let subdir = iter.get_directory();
                 if (!subdir.get_is_nodisplay())