diff --git a/include/wx/gtk/setup0.h b/include/wx/gtk/setup0.h
index 1ee8f50321..29351a6891 100644
--- a/include/wx/gtk/setup0.h
+++ b/include/wx/gtk/setup0.h
@@ -1565,6 +1565,15 @@
 // Recommended setting: 1, set to 0 for a tiny library size reduction
 #define wxUSE_TASKBARICON_BALLOONS 1
 
+// Set this to 1 to enable following functionality added in Windows 7: thumbnail
+// representations, thumbnail toolbars, notification and status overlays,
+// progress indicators and jump lists.
+//
+// Default is 1.
+//
+// Recommended setting: 1, set to 0 for a tiny library size reduction
+#define wxUSE_TASKBARBUTTON 1
+
 // Set to 1 to compile MS Windows XP theme engine support
 #define wxUSE_UXTHEME           1
 
diff --git a/include/wx/msw/chkconf.h b/include/wx/msw/chkconf.h
index d1bebed82b..1450460f0a 100644
--- a/include/wx/msw/chkconf.h
+++ b/include/wx/msw/chkconf.h
@@ -86,6 +86,14 @@
 #   endif
 #endif /* wxUSE_TASKBARICON_BALLOONS */
 
+#ifndef wxUSE_TASKBARBUTTON
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_TASKBARBUTTON must be defined."
+#   else
+#       define wxUSE_TASKBARBUTTON 0
+#   endif
+#endif /* wxUSE_TASKBARBUTTON */
+
 #ifndef wxUSE_UXTHEME
 #    ifdef wxABORT_ON_CONFIG_ERROR
 #        error "wxUSE_UXTHEME must be defined."
diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h
index f968ecdbdb..2705a44f29 100644
--- a/include/wx/msw/setup0.h
+++ b/include/wx/msw/setup0.h
@@ -1608,6 +1608,15 @@
 // Recommended setting: 1, set to 0 for a tiny library size reduction
 #define wxUSE_TASKBARICON_BALLOONS 1
 
+// Set this to 1 to enable following functionality added in Windows 7: thumbnail
+// representations, thumbnail toolbars, notification and status overlays,
+// progress indicators and jump lists.
+//
+// Default is 1.
+//
+// Recommended setting: 1, set to 0 for a tiny library size reduction
+#define wxUSE_TASKBARBUTTON 1
+
 // Set to 1 to compile MS Windows XP theme engine support
 #define wxUSE_UXTHEME           1
 
diff --git a/include/wx/msw/setup_inc.h b/include/wx/msw/setup_inc.h
index 59bcb1aef0..ea53b075cb 100644
--- a/include/wx/msw/setup_inc.h
+++ b/include/wx/msw/setup_inc.h
@@ -100,6 +100,15 @@
 // Recommended setting: 1, set to 0 for a tiny library size reduction
 #define wxUSE_TASKBARICON_BALLOONS 1
 
+// Set this to 1 to enable following functionality added in Windows 7: thumbnail
+// representations, thumbnail toolbars, notification and status overlays,
+// progress indicators and jump lists.
+//
+// Default is 1.
+//
+// Recommended setting: 1, set to 0 for a tiny library size reduction
+#define wxUSE_TASKBARBUTTON 1
+
 // Set to 1 to compile MS Windows XP theme engine support
 #define wxUSE_UXTHEME           1
 
diff --git a/setup.h.in b/setup.h.in
index cb0bf414fb..ccad90f739 100644
--- a/setup.h.in
+++ b/setup.h.in
@@ -658,6 +658,8 @@
 
 #define wxUSE_TASKBARICON_BALLOONS 0
 
+#define wxUSE_TASKBARBUTTON 0
+
 #define wxUSE_UXTHEME           0
 
 #define wxUSE_INKEDIT  0