diff --git a/.clang-format b/.clang-format
new file mode 100644
index 0000000..0d9ceec
--- /dev/null
+++ b/.clang-format
@@ -0,0 +1,15 @@
+---
+Language:        Cpp
+BasedOnStyle:    LLVM
+AlignEscapedNewlinesLeft: true
+BraceWrapping:
+  AfterClass:      true
+  AfterFunction:   true
+ColumnLimit:     500
+IndentWidth:     4
+ObjCBlockIndentWidth: 4
+TabWidth:        4
+UseTab:          Never
+NamespaceIndentation: All
+...
+
diff --git a/Makefile b/Makefile
index 15a04dd..86f944b 100644
--- a/Makefile
+++ b/Makefile
@@ -14,5 +14,8 @@ dump978: dump978_main.o socket_output.o message_dispatch.o fec.o libs/fec/init_r
 faup978: faup978_main.o socket_input.o uat_message.o track.o faup978_reporter.o
 	$(CXX) $(CXXFLAGS) $(LDFLAGS) $^ -o $@ $(LIBS)
 
+format:
+	clang-format -style=file -i *.cc *.h
+
 clean:
 	rm -f *.o fec/*.o dump978 faup978