diff --git a/genheader.sh b/genheader.sh
new file mode 100755
index 0000000..7be2999
--- /dev/null
+++ b/genheader.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+echo "/**************************************************************************************************************************************"
+echo "* Project:       discoverpixy"
+echo "* Authors:       Aaron Schmocker, Timo Lang"
+echo "* Institution:   BFH Bern University of Applied Sciences"
+echo "* File:          $1"
+echo "*"
+echo "* Version History:"
+echo "* Date		Autor Email		SHA	Changes"
+
+git log --pretty=format:"* %ad%x09%ae%x09%h%x09%s" --date=short --date-order --no-merges --reverse $1 | grep -v -i "fileheader"
+
+echo "*"
+echo "**************************************************************************************************************************************/"
diff --git a/updateheaders.sh b/updateheaders.sh
new file mode 100755
index 0000000..84068bb
--- /dev/null
+++ b/updateheaders.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+
+FILES=`find common/ emulator/ discovery/ -name "*.c" -or -name "*.h" -or -name "*.cpp" | grep -v libs | grep -v /pixy/`
+
+for FILE in $FILES; do
+	echo "Adding Header to $FILE"
+	
+	#remove old header
+	CONTENT=$(perl -0777 -pe  's%^/\*.*?discoverpixy.*?\*/%%igs' $FILE)
+
+	#add new header
+	./genheader.sh $FILE > $FILE
+	
+	#append file content
+	echo "$CONTENT" >> $FILE
+
+done
+