diff --git a/ChangeLog b/ChangeLog
index 7269a7474f..f392025b94 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-03-15  Michael Natterer  <mitch@gimp.org>
+
+	* data/brushes/Makefile.am: group files by type.
+
 2007-03-15  Martin Nordholts  <martinn@svn.gnome.org>
 
 	Converted .gbr to .vbr brushes where possible. Fixes bug #322176 and
diff --git a/data/brushes/Makefile.am b/data/brushes/Makefile.am
index 9726ce98e1..165eca0a19 100644
--- a/data/brushes/Makefile.am
+++ b/data/brushes/Makefile.am
@@ -9,6 +9,14 @@ brushdata_DATA = \
 	20x20squareBlur.gbr		\
 	5x5square.gbr			\
 	5x5squareBlur.gbr		\
+	confetti.gbr			\
+	dunes.gbr			\
+	galaxy.gbr			\
+	galaxy_big.gbr			\
+	galaxy_small.gbr		\
+	pepper.gbr			\
+	pixel.gbr			\
+	\
 	Calligraphic-Brush-0.vbr	\
 	Calligraphic-Brush-1.vbr	\
 	Calligraphic-Brush-2.vbr	\
@@ -35,19 +43,13 @@ brushdata_DATA = \
 	Diagonal-Star-11.vbr		\
 	Diagonal-Star-17.vbr		\
 	Diagonal-Star-25.vbr		\
+	\
 	SketchBrush-16.gih		\
 	SketchBrush-32.gih		\
 	SketchBrush-64.gih		\
-	confetti.gbr			\
 	confetti.gih			\
-	dunes.gbr			\
 	feltpen.gih			\
-	galaxy.gbr			\
-	galaxy_big.gbr			\
-	galaxy_small.gbr		\
 	hsparks.gih			\
-	pepper.gbr			\
-	pixel.gbr			\
 	vine.gih
 
 EXTRA_DIST = $(brushdata_DATA)