diff --git a/Makefile.am b/Makefile.am
index 7ddfdb16dd..a97575d973 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,14 +1,14 @@
 
 if HAVE_LIBGLADE_GNOME
 # The following line mustn't be indented - automake is _very_ fussy..
-gstplay_subdir=gstplay
+libglade_subdir=gstplay editor
 else
 # The following line mustn't be indented - automake is _very_ fussy..
-gstplay_subdir=
+libglade_subdir=
 endif
 
 # These are the subdirs which might get used.
-SUBDIRS = gst libs plugins . $(gstplay_subdir) test editor tools docs # tests
+SUBDIRS = gst libs plugins . test $(libglade_subdir) tools docs # tests
 
 # These are all the possible subdirs
 DIST_SUBDIRS = gst libs plugins . gstplay test editor tools docs tests