diff --git a/Makefile.am b/Makefile.am
index f0d2b82c7..1046b9bc8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -49,8 +49,7 @@ dist_noinst_SCRIPTS = \
 SUBDIRS = \
 	. \
 	po \
-	tests \
-	tools
+	tests
 
 MOSTLYCLEANFILES =
 
@@ -61,6 +60,7 @@ indentfiles =
 include doc/local.mk
 include examples/local.mk
 include src/local.mk
+include tools/local.mk
 
 # Convenience targets to build libfl only
 # These are actually wrappers around automake- and libtool-generated targets
diff --git a/configure.ac b/configure.ac
index a141974c4..dec7466c4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -217,7 +217,6 @@ AC_CONFIG_FILES(
 Makefile
 po/Makefile.in
 src/libfl.pc
-tools/Makefile
 tests/Makefile
 )
 
diff --git a/tools/Makefile.am b/tools/Makefile.am
deleted file mode 100644
index 46743a669..000000000
--- a/tools/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-EXTRA_DIST = \
-	git2cl
diff --git a/tools/local.mk b/tools/local.mk
new file mode 100644
index 000000000..f8b15be32
--- /dev/null
+++ b/tools/local.mk
@@ -0,0 +1,2 @@
+EXTRA_DIST += \
+	tools/git2cl