diff --git a/tools/check-contiki-style b/tools/check-contiki-style
new file mode 100755
index 000000000..17096267c
--- /dev/null
+++ b/tools/check-contiki-style
@@ -0,0 +1,9 @@
+#!/bin/sh
+f=`basename $1`
+mkdir /tmp/$$
+cp $1 /tmp/$$/
+cp $1 /tmp/$$/$f.orig
+export INDENT_PROFILE=`dirname $0`/indent.pro
+indent /tmp/$$/$f
+diff /tmp/$$/$f.orig /tmp/$$/$f
+rm -rf /tmp/$$
diff --git a/tools/contiki-indent b/tools/contiki-indent
index 3a26bfa2f..9bcd36a14 100755
--- a/tools/contiki-indent
+++ b/tools/contiki-indent
@@ -1,3 +1,3 @@
 #!/bin/sh
 export INDENT_PROFILE=`dirname $0`/indent.pro
-indent $1 
+indent $*