diff --git a/src/stub/scripts/upx-clang-format b/src/stub/scripts/upx-clang-format
new file mode 100755
index 00000000..422f2e66
--- /dev/null
+++ b/src/stub/scripts/upx-clang-format
@@ -0,0 +1,29 @@
+#!/bin/sh
+set -e
+
+# NOTE: we are using clang-format-3.9.0 from upx-stubtools
+# see https://github.com/upx/upx-stubtools/releases
+
+CLANG_FORMAT="$HOME/local/bin/bin-upx/clang-format-3.9.0"
+if ! test -f "$CLANG_FORMAT"; then
+CLANG_FORMAT="$HOME/bin/bin-upx/clang-format-3.9.0"
+fi
+if ! test -f "$CLANG_FORMAT"; then
+    echo "ERROR: $0: cannot find clang-format-3.9.0"
+    exit 1
+fi
+
+s='Language: Cpp, BasedOnStyle: LLVM, '
+s="$s"' AccessModifierOffset: -4, '
+#s="$s"' AllowShortFunctionsOnASingleLine: None, '
+s="$s"' AlwaysBreakTemplateDeclarations: true, '
+s="$s"' ColumnLimit: 100, '
+s="$s"' IndentWidth: 4, '
+s="$s"' SortIncludes: false, '
+s="$s"' SpaceAfterCStyleCast: true, '
+s="$s"' Standard: Cpp03, '
+CLANG_FORMAT_STYLE='-style={'"$s"' }'
+
+#echo $CLANG_FORMAT
+exec "$CLANG_FORMAT" "$CLANG_FORMAT_STYLE" "$@"
+exit 1