diff --git a/.clang-format b/.clang-format
new file mode 100644
index 000000000..e54954b03
--- /dev/null
+++ b/.clang-format
@@ -0,0 +1,31 @@
+---
+IndentWidth: 4
+ColumnLimit: 120
+UseTab: Never
+---
+Language: Cpp
+DerivePointerAlignment: false
+PointerAlignment: Left
+AlignAfterOpenBracket: Align
+AlignConsecutiveAssignments: false
+BreakBeforeBraces: Allman
+IndentCaseLabels: false
+AllowShortBlocksOnASingleLine: true
+AlignOperands: true
+AlignTrailingComments: true
+AlwaysBreakBeforeMultilineStrings: true
+AlwaysBreakTemplateDeclarations: true
+BreakConstructorInitializersBeforeComma: true
+BreakStringLiterals: true
+AlwaysBreakAfterReturnType: None
+AlwaysBreakAfterDefinitionReturnType: None
+AllowShortFunctionsOnASingleLine: All
+Cpp11BracedListStyle: true
+NamespaceIndentation: None
+ReflowComments: true
+BinPackArguments: true
+BinPackParameters: true
+SortIncludes: false
+AccessModifierOffset: -4
+ConstructorInitializerIndentWidth: 0
+ConstructorInitializerAllOnOneLineOrOnePerLine: true
diff --git a/amuse b/amuse
index 596bc66ce..5bae40d3c 160000
--- a/amuse
+++ b/amuse
@@ -1 +1 @@
-Subproject commit 596bc66ce62220bc5bca55ec3eae768ae9f6b333
+Subproject commit 5bae40d3c30c4471c55584f6bdbf1465eff19707
diff --git a/hecl b/hecl
index 8c745118b..ee64d9872 160000
--- a/hecl
+++ b/hecl
@@ -1 +1 @@
-Subproject commit 8c745118b4e86a883a31013b3948510a0cb28e81
+Subproject commit ee64d9872b9eb793371b1c62006b7e86ca79de8f
diff --git a/specter b/specter
index 720ab3d95..ba713f562 160000
--- a/specter
+++ b/specter
@@ -1 +1 @@
-Subproject commit 720ab3d9527946ad753433b5b73abeeb87b8efe1
+Subproject commit ba713f562b5b73b442e3e5e32c367b77ce843a66