diff --git a/configure.ac.in b/configure.ac.in
index bad0469fa41a40cf19d70c4bf97e32991bfff831..9b963e4582c2639133763644d7a0a87920f62eb2 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -123,11 +123,21 @@ XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.30.0])
 XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.10.0])
 XDT_CHECK_PACKAGE([GOBJECT], [gobject-2.0], [2.30.0])
 XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.30.0])
-XDT_CHECK_PACKAGE([GTK2], [gtk+-2.0], [2.24.0])
-XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.10.0])
 XDT_CHECK_PACKAGE([GTK3], [gtk+-3.0], [3.14.0])
 XDT_CHECK_PACKAGE([LIBXFCE4UI2], [libxfce4ui-2], [4.11.1])
 
+dnl ***********************************************************
+dnl *** Optional support for a GTK+2 version of the library ***
+dnl ***********************************************************
+XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.10.0])
+XDT_CHECK_OPTIONAL_PACKAGE([LIBXFCE4UI],
+                           [libxfce4ui-1], [4.10.0], [libxfce4ui],
+                           [libxfce4ui support])
+XDT_CHECK_OPTIONAL_PACKAGE([GTK2],
+                           [gtk+-2.0], [2.24.0], [gtk2],
+                           [GTK+ 2 support])
+AM_CONDITIONAL([ENABLE_GTK2_LIBRARY], [test "x$GTK2_FOUND" = "xyes" -a "x$LIBXFCE4UI_FOUND" = "xyes"])
+
 dnl *************************
 dnl *** Check for gtk-doc ***
 dnl *************************
@@ -168,4 +178,9 @@ echo
 echo "Build Configuration:"
 echo
 echo "* Debug Support:  $enable_debug"
+if test x"$GTK2_FOUND" = x"yes" -a x"$LIBXFCE4UI_FOUND" = x"yes"; then
+echo "* GTK2 support:  yes"
+else
+echo "* GTK2 support:  no"
+fi
 echo
diff --git a/garcon-gtk/Makefile.am b/garcon-gtk/Makefile.am
index 32db6836cf683c01d65aa373b8d8530047561409..5f9b4d09b587dec56a68297db154b45aa6ee8ae1 100644
--- a/garcon-gtk/Makefile.am
+++ b/garcon-gtk/Makefile.am
@@ -26,7 +26,6 @@ AM_CPPFLAGS = \
 	$(PLATFORM_CFLAGS)
 
 lib_LTLIBRARIES = \
-	libgarcon-gtk2-1.la \
 	libgarcon-gtk3-1.la
 
 libgarcon_gtk_headers = \
@@ -36,6 +35,13 @@ libgarcon_gtk_headers = \
 libgarcon_gtk_sources = \
 	garcon-gtk-menu.c
 
+##
+## GTK+ 2 support library
+##
+if ENABLE_GTK2_LIBRARY
+
+lib_LTLIBRARIES += libgarcon-gtk2-1.la
+
 libgarcon_gtk2includedir = \
 	$(includedir)/garcon-gtk2-1/garcon-gtk
 
@@ -73,9 +79,11 @@ libgarcon_gtk2_1_la_LIBADD = \
 	$(GTHREAD_LIBS) \
 	$(LIBXFCE4UI_LIBS)
 
-libgarcon_gtk2_DEPENDENCIES = \
+libgarcon_gtk2_1_la_DEPENDENCIES = \
 	$(top_builddir)/garcon/libgarcon-$(GARCON_VERSION_API).la
 
+endif
+
 
 libgarcon_gtk3includedir = \
 	$(includedir)/garcon-gtk3-1/garcon-gtk
@@ -114,7 +122,7 @@ libgarcon_gtk3_1_la_LIBADD = \
 	$(GTHREAD_LIBS) \
 	$(LIBXFCE4UI2_LIBS)
 
-libgarcon_gtk3_DEPENDENCIES = \
+libgarcon_gtk3_1_la_DEPENDENCIES = \
 	$(top_builddir)/garcon/libgarcon-$(GARCON_VERSION_API).la
 
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 6b5d0d0b14e5f0d632c21c136d9bcc29ff41a5ca..d5b1f8605adc2084b7b4ef1c302c2ff5c15d7844 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -24,9 +24,12 @@ AM_CPPFLAGS =								\
 noinst_PROGRAMS =							\
 	test-menu-parser						\
 	test-menu-spec							\
-	test-display-menu-gtk2					\
 	test-display-menu-gtk3
 
+if ENABLE_GTK2_LIBRARY
+noinst_PROGRAMS += test-display-menu-gtk2
+endif
+
 # test-menu-parser
 test_menu_parser_SOURCES =						\
 	test-menu-parser.c
@@ -68,6 +71,7 @@ test_menu_spec_LDADD =							\
 	$(top_builddir)/garcon/libgarcon-$(GARCON_VERSION_API).la
 
 # test-display-menu-gtk2
+if ENABLE_GTK2_LIBRARY
 test_display_menu_gtk2_SOURCES =				\
 	test-display-menu.c
 
@@ -89,6 +93,7 @@ test_display_menu_gtk2_LDADD =					\
 	$(GTK2_LIBS)							\
 	$(top_builddir)/garcon/libgarcon-$(GARCON_VERSION_API).la	\
 	$(top_builddir)/garcon-gtk/libgarcon-gtk2-1.la
+endif
 
 # test-display-menu-gtk3
 test_display_menu_gtk3_SOURCES =				\