diff --git a/Makefile.am b/Makefile.am
index 050202dd51..e4818baad4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 ## Makefile.am for GTK+
 include $(top_srcdir)/Makefile.decl
 
-SRC_SUBDIRS = gdk gtk modules demos tests perf examples
+SRC_SUBDIRS = gdk gtk libgail-util modules demos tests perf examples
 SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build
 
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
diff --git a/configure.ac b/configure.ac
index 9197b6c077..89f965edde 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1738,9 +1738,9 @@ gtk/makefile.msc
 gtk/gtkversion.h
 gtk/gtk-win32.rc
 gtk/a11y/Makefile
-gtk/a11y/libgail-util/Makefile
 gtk/a11y/tests/Makefile
 gtk/tests/Makefile
+libgail-util/Makefile
 modules/Makefile
 modules/engines/Makefile
 modules/engines/pixbuf/Makefile
diff --git a/gtk/a11y/Makefile.am b/gtk/a11y/Makefile.am
index 427bf2cf84..5d1e3754ce 100644
--- a/gtk/a11y/Makefile.am
+++ b/gtk/a11y/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/Makefile.decl
 
-SUBDIRS = libgail-util tests
+SUBDIRS = tests
 
 if PLATFORM_WIN32
 no_undefined = -no-undefined
diff --git a/gtk/a11y/libgail-util/Makefile.am b/libgail-util/Makefile.am
similarity index 100%
rename from gtk/a11y/libgail-util/Makefile.am
rename to libgail-util/Makefile.am
diff --git a/gtk/a11y/libgail-util/gail-util.h b/libgail-util/gail-util.h
similarity index 100%
rename from gtk/a11y/libgail-util/gail-util.h
rename to libgail-util/gail-util.h
diff --git a/gtk/a11y/libgail-util/gailmisc.c b/libgail-util/gailmisc.c
similarity index 100%
rename from gtk/a11y/libgail-util/gailmisc.c
rename to libgail-util/gailmisc.c
diff --git a/gtk/a11y/libgail-util/gailmisc.h b/libgail-util/gailmisc.h
similarity index 100%
rename from gtk/a11y/libgail-util/gailmisc.h
rename to libgail-util/gailmisc.h
diff --git a/gtk/a11y/libgail-util/gailtextutil.c b/libgail-util/gailtextutil.c
similarity index 100%
rename from gtk/a11y/libgail-util/gailtextutil.c
rename to libgail-util/gailtextutil.c
diff --git a/gtk/a11y/libgail-util/gailtextutil.h b/libgail-util/gailtextutil.h
similarity index 100%
rename from gtk/a11y/libgail-util/gailtextutil.h
rename to libgail-util/gailtextutil.h
diff --git a/gtk/a11y/libgail-util/gailutil.def b/libgail-util/gailutil.def
similarity index 100%
rename from gtk/a11y/libgail-util/gailutil.def
rename to libgail-util/gailutil.def