diff --git a/Makefile.am b/Makefile.am
index 3055e5a77..420152953 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,7 @@ NULL =
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = src util test docs
+SUBDIRS = src util test perf docs
 
 EXTRA_DIST = \
 	autogen.sh \
@@ -26,19 +26,6 @@ EXTRA_DIST = \
 	subprojects/ragel.wrap \
 	subprojects/packagefiles/ragel/meson.build \
 	subprojects/ttf-parser.wrap \
-	perf/meson.build \
-	perf/perf-draw.hh \
-	perf/perf-extents.hh \
-	perf/perf-shaping.hh \
-	perf/perf.cc \
-	perf/fonts/Amiri-Regular.ttf \
-	perf/fonts/NotoNastaliqUrdu-Regular.ttf \
-	perf/fonts/NotoSansDevanagari-Regular.ttf \
-	perf/fonts/Roboto-Regular.ttf \
-	perf/texts/en-thelittleprince.txt \
-	perf/texts/en-words.txt \
-	perf/texts/fa-monologue.txt \
-	perf/texts/fa-thelittleprince.txt \
 	mingw-configure.sh \
 	$(NULL)
 
diff --git a/configure.ac b/configure.ac
index c353567d4..295a0c714 100644
--- a/configure.ac
+++ b/configure.ac
@@ -437,6 +437,7 @@ test/shape/data/text-rendering-tests/Makefile
 test/subset/Makefile
 test/subset/data/Makefile
 test/subset/data/repack_tests/Makefile
+perf/Makefile
 docs/Makefile
 docs/version.xml
 ])
diff --git a/perf/Makefile.am b/perf/Makefile.am
new file mode 100644
index 000000000..5e08eebe7
--- /dev/null
+++ b/perf/Makefile.am
@@ -0,0 +1,24 @@
+# Process this file with automake to produce Makefile.in
+
+NULL =
+EXTRA_DIST =
+SUBDIRS =
+
+EXTRA_DIST +=
+	meson.build \
+	perf-draw.hh \
+	perf-extents.hh \
+	perf.cc \
+	benchmark-map.cc \
+	benchmark-set.cc \
+	benchmark-shape.cc \
+	benchmark-subset.cc \
+	fonts \
+	texts \
+	$(NULL)
+
+# Convenience targets:
+lib:
+	@$(MAKE) $(AM_MAKEFLAGS) -C $(top_builddir)/src lib
+
+-include $(top_srcdir)/git.mk