diff --git a/.clang-format b/.clang-format
new file mode 100644
index 0000000..e2d5ba7
--- /dev/null
+++ b/.clang-format
@@ -0,0 +1,10 @@
+UseTab: ForIndentation
+TabWidth: 4
+IndentWidth: 4
+BreakBeforeBraces: Allman
+IndentCaseLabels: false
+ColumnLimit: 0
+PointerAlignment: Left
+BreakConstructorInitializersBeforeComma: true
+NamespaceIndentation: None
+AlignEscapedNewlines: DontAlign
diff --git a/Makefile b/Makefile
index baffc66..0709572 100644
--- a/Makefile
+++ b/Makefile
@@ -74,6 +74,9 @@ release: build/pugixml-$(VERSION).tar.gz build/pugixml-$(VERSION).zip
 
 docs: docs/quickstart.html docs/manual.html
 
+format:
+	clang-format -i src/*.cpp src/*.hpp tests/*.cpp tests/*.hpp
+
 build/pugixml-%: .FORCE | $(RELEASE)
 	@mkdir -p $(BUILD)
 	TIMESTAMP=`git show v$(VERSION) -s --format=%ct` && python scripts/archive.py $@ pugixml-$(VERSION) $$TIMESTAMP $|