diff --git a/NEWS b/NEWS
index f27ae04..1ab404e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+3.22.1
+======
+* window-list: Update icon on app changes
+
 3.22.0
 ======
 * updated translations (en_GB)
diff --git a/configure b/configure
index 8920944..e3134b2 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.22.0.
+# Generated by GNU Autoconf 2.69 for gnome-shell-extensions 3.22.1.
 #
 # Report bugs to <https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell&component=extensions>.
 #
@@ -581,8 +581,8 @@
 # Identity of this package.
 PACKAGE_NAME='gnome-shell-extensions'
 PACKAGE_TARNAME='gnome-shell-extensions'
-PACKAGE_VERSION='3.22.0'
-PACKAGE_STRING='gnome-shell-extensions 3.22.0'
+PACKAGE_VERSION='3.22.1'
+PACKAGE_STRING='gnome-shell-extensions 3.22.1'
 PACKAGE_BUGREPORT='https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell&component=extensions'
 PACKAGE_URL=''
 
@@ -1283,7 +1283,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.22.0 to adapt to many kinds of systems.
+\`configure' configures gnome-shell-extensions 3.22.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1354,7 +1354,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of gnome-shell-extensions 3.22.0:";;
+     short | recursive ) echo "Configuration of gnome-shell-extensions 3.22.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1472,7 +1472,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-gnome-shell-extensions configure 3.22.0
+gnome-shell-extensions configure 3.22.1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1652,7 +1652,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.22.0, which was
+It was created by gnome-shell-extensions $as_me 3.22.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2519,7 +2519,7 @@
 
 # Define the identity of the package.
  PACKAGE='gnome-shell-extensions'
- VERSION='3.22.0'
+ VERSION='3.22.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -7330,7 +7330,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.22.0, which was
+This file was extended by gnome-shell-extensions $as_me 3.22.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -7387,7 +7387,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.22.0
+gnome-shell-extensions config.status 3.22.1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 35ac8a7..976d574 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.63)
-AC_INIT([gnome-shell-extensions],[3.22.0],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell&component=extensions])
+AC_INIT([gnome-shell-extensions],[3.22.1],[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 d47f256..009ff7b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gnome-shell-extensions (3.22.1-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Michael Biebl <biebl@debian.org>  Tue, 11 Oct 2016 17:58:31 +0200
+
 gnome-shell-extensions (3.22.0-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/extensions/window-list/extension.js b/extensions/window-list/extension.js
index bdd4680..15db297 100644
--- a/extensions/window-list/extension.js
+++ b/extensions/window-list/extension.js
@@ -152,6 +152,12 @@
         this._iconThemeChangedId =
             this._textureCache.connect('icon-theme-changed',
                                        Lang.bind(this, this._updateIcon));
+        this._notifyWmClass =
+            this._metaWindow.connect('notify::wm-class',
+                                     Lang.bind(this, this._updateIcon));
+        this._notifyAppId =
+            this._metaWindow.connect('notify::gtk-application-id',
+                                     Lang.bind(this, this._updateIcon));
         this._updateIcon();
 
         this.actor.connect('destroy', Lang.bind(this, this._onDestroy));
@@ -193,6 +199,8 @@
         this._textureCache.disconnect(this._iconThemeChangedId);
         this._metaWindow.disconnect(this._notifyTitleId);
         this._metaWindow.disconnect(this._notifyMinimizedId);
+        this._metaWindow.disconnect(this._notifyWmClass);
+        this._metaWindow.disconnect(this._notifyAppId);
     }
 });