diff --git a/ChangeLog b/ChangeLog
index 94aa9fc0d..8e90e0239 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2008-04-28  Neil Roberts  <neil@o-hand.com>
+
+	Fixed 'make dist'
+
+	* clutter/cogl/Makefile.am (EXTRA_DIST): Distribute cogl.h.in
+	instead of cogl.h
+	(DIST_SUBDIRS): Added common folder
+
+	* clutter/cogl/gl/Makefile.am (libclutter_cogl_la_SOURCES): Remove
+	cogl-defines.h and use the right location for cogl-defines.gl.h
+	(EXTRA_DIST): Distribute cogl-defines.h.in
+
+	* clutter/cogl/gles/Makefile.am (libclutter_cogl_la_SOURCES):
+	Remove cogl-defines.h and use the right location for
+	cogl-defines.gles.h
+	(EXTRA_DIST): Distribute cogl-defines.h.in
+
+	* clutter/Makefile.am (DIST_SUBDIRS): Add fruity
+
 2008-04-28  Neil Roberts  <neil@o-hand.com>
 
 	* clutter/cogl/cogl.h.in (COGL_A_BIT): Added the missing comma
diff --git a/clutter/Makefile.am b/clutter/Makefile.am
index 704520389..98d6e6996 100644
--- a/clutter/Makefile.am
+++ b/clutter/Makefile.am
@@ -9,7 +9,7 @@ clutter_json_dep = json/libclutter-json.la
 clutter_json_libadd = $(top_builddir)/clutter/json/libclutter-json.la
 endif
 
-DIST_SUBDIRS = pango glx eglx eglnative cogl sdl json osx x11 win32
+DIST_SUBDIRS = pango glx eglx eglnative cogl sdl json osx x11 win32 fruity
 
 target = $(clutterbackend)
 
diff --git a/clutter/cogl/Makefile.am b/clutter/cogl/Makefile.am
index 9bb6b772c..7cf4aac17 100644
--- a/clutter/cogl/Makefile.am
+++ b/clutter/cogl/Makefile.am
@@ -1,5 +1,5 @@
 SUBDIRS = common $(CLUTTER_COGL)
 
-EXTRA_DIST = cogl.h
+EXTRA_DIST = cogl.h.in
 
-DIST_SUBDIRS = gl gles
+DIST_SUBDIRS = common gl gles
diff --git a/clutter/cogl/gl/Makefile.am b/clutter/cogl/gl/Makefile.am
index 17e5ed465..be2e20606 100644
--- a/clutter/cogl/gl/Makefile.am
+++ b/clutter/cogl/gl/Makefile.am
@@ -20,8 +20,7 @@ noinst_LTLIBRARIES = libclutter-cogl.la
 
 libclutter_cogl_la_SOURCES = \
 	$(top_builddir)/clutter/cogl/cogl.h \
-	$(top_builddir)/clutter/cogl/gl/cogl-defines.h \
-        cogl-defines.h \
+	$(top_builddir)/clutter/cogl/cogl-defines-gl.h \
 	cogl-internal.h \
 	cogl-primitives.h \
 	cogl-texture.h \
@@ -33,4 +32,6 @@ libclutter_cogl_la_SOURCES = \
 	cogl-fbo.c \
 	cogl-context.c
 
+EXTRA_DIST = cogl-defines.h.in
+
 libclutter_cogl_la_LIBADD =  $(top_builddir)/clutter/cogl/common/libclutter-cogl-common.la
diff --git a/clutter/cogl/gles/Makefile.am b/clutter/cogl/gles/Makefile.am
index c629e1ee5..fb663d660 100644
--- a/clutter/cogl/gles/Makefile.am
+++ b/clutter/cogl/gles/Makefile.am
@@ -20,8 +20,7 @@ noinst_LTLIBRARIES = libclutter-cogl.la
 
 libclutter_cogl_la_SOURCES = \
 	$(top_builddir)/clutter/cogl/cogl.h \
-	$(top_builddir)/clutter/cogl/gles/cogl-defines.h \
-        cogl-defines.h \
+	$(top_builddir)/clutter/cogl/cogl-defines-gles.h \
 	cogl-internal.h \
 	cogl-primitives.h \
 	cogl-texture.h \
@@ -33,4 +32,6 @@ libclutter_cogl_la_SOURCES = \
 	cogl-fbo.c \
 	cogl-context.c
 
+EXTRA_DIST = cogl-defines.h.in
+
 libclutter_cogl_la_LIBADD =  $(top_builddir)/clutter/cogl/common/libclutter-cogl-common.la