diff --git a/configure.in b/configure.in
index 98c449b59b..5e60f943ad 100644
--- a/configure.in
+++ b/configure.in
@@ -4544,6 +4544,10 @@ fi
 
 if test "$wxUSE_SYSTEM_OPTIONS" = "yes"; then
     AC_DEFINE(wxUSE_SYSTEM_OPTIONS)
+if test "$TOOLKIT" = "MSW"; then
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS taskbar"
+fi
+
 fi
 
 if test "$wxUSE_PROTOCOL" = "yes"; then
diff --git a/samples/configure.in b/samples/configure.in
index c95587e95a..4468e5fbe2 100644
--- a/samples/configure.in
+++ b/samples/configure.in
@@ -78,6 +78,7 @@ AC_OUTPUT([
             sockets/Makefile
             splitter/Makefile
             statbar/Makefile
+	    taskbar/Makefile
             text/Makefile
             thread/Makefile
             toolbar/Makefile