diff --git a/clutter/Makefile.am b/clutter/Makefile.am
index b19070f5a..b0a8b7c1a 100644
--- a/clutter/Makefile.am
+++ b/clutter/Makefile.am
@@ -2,7 +2,7 @@ include $(top_srcdir)/build/autotools/Makefile.am.silent
 
 NULL =
 
-SUBDIRS = cogl pango $(CLUTTER_WINSYS_BASE) $(CLUTTER_WINSYS)
+SUBDIRS = cogl $(CLUTTER_WINSYS_BASE) $(CLUTTER_WINSYS)
 
 if LOCAL_JSON_GLIB
 SUBDIRS += json
@@ -12,7 +12,7 @@ clutter_json_libadd = $(top_builddir)/clutter/json/libclutter-json.la
 clutter_json_gir = ClutterJson-@CLUTTER_API_VERSION@.gir
 endif
 
-DIST_SUBDIRS = pango glx eglx eglnative cogl sdl json osx x11 win32 fruity
+DIST_SUBDIRS = glx eglx eglnative cogl sdl json osx x11 win32 fruity
 
 # common definitions
 CLEANFILES =
@@ -21,13 +21,13 @@ EXTRA_DIST =
 BUILT_SOURCES =
 
 INCLUDES = \
-	-I$(top_srcdir) 		\
-	-I$(top_srcdir)/clutter/cogl	\
-	-I$(top_srcdir)/clutter/pango	\
-	-I$(top_srcdir)/clutter		\
-	$(clutter_json_include)		\
-	-I$(top_builddir)/clutter/cogl	\
-	-I$(top_builddir)/clutter	\
+	-I$(top_srcdir) 				\
+	-I$(top_srcdir)/clutter/cogl			\
+	-I$(top_srcdir)/clutter/cogl/pango		\
+	-I$(top_srcdir)/clutter				\
+	$(clutter_json_include)				\
+	-I$(top_builddir)/clutter/cogl			\
+	-I$(top_builddir)/clutter			\
 	$(NULL)
 
 AM_CPPFLAGS = \
@@ -182,14 +182,14 @@ source_h_priv = \
 libclutter_@CLUTTER_WINSYS@_@CLUTTER_API_VERSION@_la_LIBADD = \
 	$(CLUTTER_LIBS) \
 	$(top_builddir)/clutter/cogl/cogl/libclutter-cogl.la \
-	$(top_builddir)/clutter/pango/libcoglpango.la \
+	$(top_builddir)/clutter/cogl/pango/libcoglpango.la \
 	$(top_builddir)/clutter/$(CLUTTER_WINSYS)/libclutter-$(CLUTTER_WINSYS).la \
 	$(clutter_json_libadd) \
 	$(CLUTTER_WINSYS_BASE_LIB)
 
 libclutter_@CLUTTER_WINSYS@_@CLUTTER_API_VERSION@_la_DEPENDENCIES = \
 	$(top_builddir)/clutter/cogl/cogl/libclutter-cogl.la \
-	$(top_builddir)/clutter/pango/libcoglpango.la \
+	$(top_builddir)/clutter/cogl/pango/libcoglpango.la \
 	$(top_builddir)/clutter/$(CLUTTER_WINSYS)/libclutter-$(CLUTTER_WINSYS).la \
 	$(clutter_json_dep) \
 	$(CLUTTER_WINSYS_BASE_LIB)
diff --git a/clutter/cogl/Makefile.am b/clutter/cogl/Makefile.am
index e13c1b481..53298db2d 100644
--- a/clutter/cogl/Makefile.am
+++ b/clutter/cogl/Makefile.am
@@ -1 +1 @@
-SUBDIRS = cogl
+SUBDIRS = cogl pango
diff --git a/clutter/pango/Makefile.am b/clutter/cogl/pango/Makefile.am
similarity index 100%
rename from clutter/pango/Makefile.am
rename to clutter/cogl/pango/Makefile.am
diff --git a/clutter/pango/cogl-pango-display-list.c b/clutter/cogl/pango/cogl-pango-display-list.c
similarity index 100%
rename from clutter/pango/cogl-pango-display-list.c
rename to clutter/cogl/pango/cogl-pango-display-list.c
diff --git a/clutter/pango/cogl-pango-display-list.h b/clutter/cogl/pango/cogl-pango-display-list.h
similarity index 100%
rename from clutter/pango/cogl-pango-display-list.h
rename to clutter/cogl/pango/cogl-pango-display-list.h
diff --git a/clutter/pango/cogl-pango-fontmap.c b/clutter/cogl/pango/cogl-pango-fontmap.c
similarity index 100%
rename from clutter/pango/cogl-pango-fontmap.c
rename to clutter/cogl/pango/cogl-pango-fontmap.c
diff --git a/clutter/pango/cogl-pango-glyph-cache.c b/clutter/cogl/pango/cogl-pango-glyph-cache.c
similarity index 100%
rename from clutter/pango/cogl-pango-glyph-cache.c
rename to clutter/cogl/pango/cogl-pango-glyph-cache.c
diff --git a/clutter/pango/cogl-pango-glyph-cache.h b/clutter/cogl/pango/cogl-pango-glyph-cache.h
similarity index 100%
rename from clutter/pango/cogl-pango-glyph-cache.h
rename to clutter/cogl/pango/cogl-pango-glyph-cache.h
diff --git a/clutter/pango/cogl-pango-private.h b/clutter/cogl/pango/cogl-pango-private.h
similarity index 100%
rename from clutter/pango/cogl-pango-private.h
rename to clutter/cogl/pango/cogl-pango-private.h
diff --git a/clutter/pango/cogl-pango-render.c b/clutter/cogl/pango/cogl-pango-render.c
similarity index 100%
rename from clutter/pango/cogl-pango-render.c
rename to clutter/cogl/pango/cogl-pango-render.c
diff --git a/clutter/pango/cogl-pango.h b/clutter/cogl/pango/cogl-pango.h
similarity index 100%
rename from clutter/pango/cogl-pango.h
rename to clutter/cogl/pango/cogl-pango.h
diff --git a/configure.ac b/configure.ac
index cf875df13..94944ba12 100644
--- a/configure.ac
+++ b/configure.ac
@@ -821,8 +821,8 @@ AC_CONFIG_FILES([
         clutter/cogl/cogl/driver/Makefile
         clutter/cogl/cogl/driver/gl/Makefile
         clutter/cogl/cogl/driver/gles/Makefile
+        clutter/cogl/pango/Makefile
         clutter/json/Makefile
-        clutter/pango/Makefile
         tests/Makefile
         tests/conform/Makefile
         tests/data/Makefile