diff --git a/.clang-format b/.clang-format
index 5a4737c..7f4b986 100644
--- a/.clang-format
+++ b/.clang-format
@@ -19,3 +19,4 @@ BreakBeforeBinaryOperators: NonAssignment
 BreakStringLiterals: false
 SortIncludes:    false
 ContinuationIndentWidth: 8
+ColumnLimit: 80
diff --git a/Makefile.am b/Makefile.am
index 34de37a..3932b3d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,3 +13,6 @@ EXTRA_DIST = \
 	scripts/bip-release \
 	scripts/bipgenconfig \
 	systemd
+
+lint:
+	find src/ tests/ \( -name *.c -o -name *.h \) -type f -print0 | xargs -0 clang-format -i