diff --git a/.clang-format b/.clang-format
new file mode 100644
index 00000000..b9985ef2
--- /dev/null
+++ b/.clang-format
@@ -0,0 +1,14 @@
+BasedOnStyle: LLVM
+IndentWidth: 4
+UseTab: Never
+PointerAlignment: Right
+InsertBraces: true
+BreakBeforeBraces: Attach
+AllowShortIfStatementsOnASingleLine: WithoutElse
+AllowShortLoopsOnASingleLine: true
+AllowShortFunctionsOnASingleLine: Inline
+ColumnLimit: 0
+IndentCaseLabels: true
+IndentGotoLabels: false
+AlignConsecutiveMacros:
+  Enabled: true
\ No newline at end of file
diff --git a/scripts/codestyle b/scripts/codestyle
index bbf056f2..728b5b71 100755
--- a/scripts/codestyle
+++ b/scripts/codestyle
@@ -1,13 +1,5 @@
 #!/bin/sh
 
-# formatting script using the astyle tool
-# use -A2 (java style braces)
-# 4 space indents, convert tabs to spaces
-#
-# switches documented at http://astyle.sourceforge.net/astyle.html
-#
-# optional switches to note:
-# --add-braces will add { } for every conditional, including one liners
-
-astyle -A2 --align-pointer=name --indent=spaces=4 --indent-switches \
-    --keep-one-line-blocks --pad-header --convert-tabs $@
+# formatting script using clang-format.
+# the format is described in .clang-format file at the root of the project.
+clang-format --verbose -i $@
\ No newline at end of file