diff --git a/data/brushes/Basic/Makefile.am b/data/brushes/Basic/Makefile.am
index 461e6f95c9..eefb7afb7d 100644
--- a/data/brushes/Basic/Makefile.am
+++ b/data/brushes/Basic/Makefile.am
@@ -11,6 +11,7 @@ brushbasicdata_DATA = \
 	Hardness-050.vbr	\
 	Hardness-075.vbr	\
 	Hardness-100.vbr	\
+	pixel.gbr		\
 	Star.vbr
 
 EXTRA_DIST = $(brushbasicdata_DATA)
diff --git a/data/brushes/Legacy/Makefile.am b/data/brushes/Legacy/Makefile.am
index 26f15e88d8..110fff1100 100644
--- a/data/brushes/Legacy/Makefile.am
+++ b/data/brushes/Legacy/Makefile.am
@@ -11,5 +11,4 @@ brushlegacydata_DATA = \
 	pepper.gbr	\
 	vine.gih
 
-
 EXTRA_DIST = $(brushmlegacydata_DATA)
diff --git a/data/brushes/Makefile.am b/data/brushes/Makefile.am
index b2a12e3ceb..afa44b62b4 100644
--- a/data/brushes/Makefile.am
+++ b/data/brushes/Makefile.am
@@ -8,4 +8,3 @@ SUBDIRS = \
 	Sketch			\
 	Splatters		\
 	Texture
-
diff --git a/data/brushes/gimp-obsolete-files/Makefile.am b/data/brushes/gimp-obsolete-files/Makefile.am
index 4bc12f31f9..02724cee42 100644
--- a/data/brushes/gimp-obsolete-files/Makefile.am
+++ b/data/brushes/gimp-obsolete-files/Makefile.am
@@ -9,49 +9,39 @@ obsoletebrushdata_DATA = \
 	20x20squareBlur.gbr		\
 	5x5square.gbr			\
 	5x5squareBlur.gbr		\
-	confetti.gih			\
-	confetti.gbr			\
-	dunes.gbr			\
-	galaxy.gbr			\
-	galaxy_big.gbr			\
-	galaxy_small.gbr		\
-	\
 	Calligraphic-Brush-0.vbr	\
 	Calligraphic-Brush-1.vbr	\
 	Calligraphic-Brush-2.vbr	\
 	Calligraphic-Brush-3.vbr	\
 	Circle-1.vbr			\
-	Circle-3.vbr			\
-	Circle-5.vbr			\
-	Circle-7.vbr			\
-	Circle-9.vbr			\
 	Circle-11.vbr			\
 	Circle-13.vbr			\
 	Circle-15.vbr			\
 	Circle-17.vbr			\
 	Circle-19.vbr			\
-	Circle-Fuzzy-3.vbr		\
-	Circle-Fuzzy-5.vbr		\
-	Circle-Fuzzy-7.vbr		\
-	Circle-Fuzzy-9.vbr		\
+	Circle-3.vbr			\
+	Circle-5.vbr			\
+	Circle-7.vbr			\
+	Circle-9.vbr			\
 	Circle-Fuzzy-11.vbr		\
 	Circle-Fuzzy-13.vbr		\
 	Circle-Fuzzy-15.vbr		\
 	Circle-Fuzzy-17.vbr		\
 	Circle-Fuzzy-19.vbr		\
+	Circle-Fuzzy-3.vbr		\
+	Circle-Fuzzy-5.vbr		\
+	Circle-Fuzzy-7.vbr		\
+	Circle-Fuzzy-9.vbr		\
 	Diagonal-Star-11.vbr		\
 	Diagonal-Star-17.vbr		\
 	Diagonal-Star-25.vbr		\
-	feltpen.gih			\
-	\
+	Grass1.gih			\
 	SketchBrush-16.gih		\
 	SketchBrush-32.gih		\
 	SketchBrush-64.gih		\
+	feltpen.gih			\
+	galaxy_small.gbr		\
 	pepper.gbr			\
-	pixel.gbr			\
-	\
-	Grass1.gih			\
-	vine.gih
-
+	pixel.gbr
 
 EXTRA_DIST = $(obsoletebrushdata_DATA)
diff --git a/data/brushes/gimp-obsolete-files/confetti.gbr b/data/brushes/gimp-obsolete-files/confetti.gbr
deleted file mode 100644
index d7ba158e99..0000000000
Binary files a/data/brushes/gimp-obsolete-files/confetti.gbr and /dev/null differ
diff --git a/data/brushes/gimp-obsolete-files/confetti.gih b/data/brushes/gimp-obsolete-files/confetti.gih
deleted file mode 100644
index dfa9cc8806..0000000000
Binary files a/data/brushes/gimp-obsolete-files/confetti.gih and /dev/null differ
diff --git a/data/brushes/gimp-obsolete-files/dunes.gbr b/data/brushes/gimp-obsolete-files/dunes.gbr
deleted file mode 100644
index fc7eed2346..0000000000
Binary files a/data/brushes/gimp-obsolete-files/dunes.gbr and /dev/null differ
diff --git a/data/brushes/gimp-obsolete-files/galaxy.gbr b/data/brushes/gimp-obsolete-files/galaxy.gbr
deleted file mode 100644
index 0ed58e8f24..0000000000
Binary files a/data/brushes/gimp-obsolete-files/galaxy.gbr and /dev/null differ
diff --git a/data/brushes/gimp-obsolete-files/galaxy_big.gbr b/data/brushes/gimp-obsolete-files/galaxy_big.gbr
deleted file mode 100644
index c62cfc0d9f..0000000000
Binary files a/data/brushes/gimp-obsolete-files/galaxy_big.gbr and /dev/null differ
diff --git a/data/brushes/gimp-obsolete-files/vine.gih b/data/brushes/gimp-obsolete-files/vine.gih
deleted file mode 100644
index 65acae048a..0000000000
Binary files a/data/brushes/gimp-obsolete-files/vine.gih and /dev/null differ