diff --git a/Makefile.am b/Makefile.am
index c8fd5f3..d4920cf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,10 @@
 INCLUDES=-I$(top_srcdir)/include
-SUBDIRS=include alsactl alsamixer amixer aplay utils xamixer2
+SUBDIRS1=include alsactl alsamixer amixer aplay utils
+if COND_XAMIXER2
+SUBDIRS=$(SUBDIRS1) xamixer2
+else
+SUBDIRS=$(SUBDIRS1)
+endif
 EXTRA_DIST=ChangeLog INSTALL README configure cvscompile
 
 rpm: dist
diff --git a/configure.in b/configure.in
index 5aafc31..2e214c1 100644
--- a/configure.in
+++ b/configure.in
@@ -41,13 +41,9 @@ AC_PROG_GCC_TRADITIONAL
 
 SAVE_UTIL_VERSION
 
-if test "$GTK_LIBS" != ""; then 
+AM_CONDITIONAL(COND_XAMIXER2, test "x$GTK_LIBS" != "x")
+if test "x$GTK_LIBS" = "x"; then
+  AC_MSG_RESULT(Not building XAmixer2 as Gtk+ was not found.)
+fi
 AC_OUTPUT(Makefile alsactl/Makefile alsamixer/Makefile amixer/Makefile aplay/Makefile \
           include/Makefile utils/Makefile utils/alsa-utils.spec xamixer2/Makefile)
-
-else
-	AC_MSG_RESULT(Not building XAmixer2 as Gtk+ was not found.)
-AC_OUTPUT(Makefile alsactl/Makefile alsamixer/Makefile amixer/Makefile aplay/Makefile \
-          include/Makefile utils/Makefile utils/alsa-utils.spec)
-fi
-