diff --git a/install.sh b/install.sh
index 908c84c..23b0198 100755
--- a/install.sh
+++ b/install.sh
@@ -73,8 +73,10 @@ YEAR="$(date +%Y)"
 do_cmd find . -type f -exec sed \
 	-e "s,@P@,${P},g" \
 	-e "s,@AUTHOR@,${AUTHOR},g" \
-    -e "s,@EMAIL@,${EMAIL},g"
+    -e "s,@EMAIL@,${EMAIL},g" \
 	-e "s,@YEAR@,${YEAR},g" \
+    -e "s,@KATE_MODELINE@,${KATE_MODELINE},g" \
+    -e "s,@VIM_MODELINE@,${VIM_MODELINE},g" \
 	-i {} \; || exit 1
 
 
diff --git a/skel/README b/skel/README
index 5718185..084e9d9 100644
--- a/skel/README
+++ b/skel/README
@@ -1,5 +1,8 @@
 @P@
 ========================================================================
+(c)2006, @AUTHOR@, <@EMAIL@>.
+Released under the GNU GPLv2. See file COPYING or 
+http://www.gnu.org/copyleft/gpl.html for details.
 
 Really Quick Instructions
 -------------------------
diff --git a/skel/make.sh b/skel/make.sh
index d58943f..13a1803 100755
--- a/skel/make.sh
+++ b/skel/make.sh
@@ -1,12 +1,12 @@
 #!/bin/bash
 # @P@/make.sh
 #
-#  (c)@YEAR@, @AUTHOR@. Released under the GNU GPL. See file
-#  COPYING for more information / terms of license.
+#  (c)2006, @AUTHOR@, <@EMAIL@>.
+#  Released under the GNU GPLv2. See file COPYING or
+#  http://www.gnu.org/copyleft/gpl.html for details.
 #
 
 
-
 # This file is the script used to build @P@. There are some
 # options that can be edited; these are set below (or you can pass them
 # in as variables).
diff --git a/skel/project.kdevelop b/skel/project.kdevelop
index d8b6c63..5789f15 100644
--- a/skel/project.kdevelop
+++ b/skel/project.kdevelop
@@ -2,7 +2,7 @@
 <kdevelop>
   <general>
     <author>@AUTHOR@</author>
-    <email></email>
+    <email>@EMAIL@</email>
     <version>$VERSION$</version>
     <projectmanagement>KDevCustomProject</projectmanagement>
     <primarylanguage>C++</primarylanguage>
diff --git a/skel/run-test.sh b/skel/run-test.sh
index 7206442..9c49bd8 100755
--- a/skel/run-test.sh
+++ b/skel/run-test.sh
@@ -1,8 +1,9 @@
 #!/bin/bash
 # @P@/test.sh
 #
-#  (c)@YEAR@, @AUTHOR@. Released under the GNU GPL. See file
-#  COPYING for more information / terms of license.
+#  (c)2006, @AUTHOR@, <@EMAIL@>.
+#  Released under the GNU GPLv2. See file COPYING or
+#  http://www.gnu.org/copyleft/gpl.html for details.
 #
 
 # Running this script on its own will display a summary of all the
@@ -48,3 +49,6 @@ then
 fi
 
 run_test $*
+
+# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
+# vim: expandtab:ts=4:sw=4
diff --git a/skel/scripts/functions.sh b/skel/scripts/functions.sh
index 12b63a0..c6b1e5b 100755
--- a/skel/scripts/functions.sh
+++ b/skel/scripts/functions.sh
@@ -1,8 +1,9 @@
 #!/bin/bash
 # @P@/scripts/functions.sh
 #
-#  (c)@YEAR@, @AUTHOR@. Released under the GNU GPL. See file
-#  COPYING for more information / terms of license.
+#  (c)2006, @AUTHOR@, <@EMAIL@>.
+#  Released under the GNU GPLv2. See file COPYING or
+#  http://www.gnu.org/copyleft/gpl.html for details.
 #
 
 # Common functions
@@ -62,3 +63,6 @@ do_cmd_redir() {
         return 1
     fi
 }
+
+# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
+# vim: expandtab:ts=4:sw=4
diff --git a/skel/scripts/module-create.sh b/skel/scripts/module-create.sh
index e138500..9b48b27 100755
--- a/skel/scripts/module-create.sh
+++ b/skel/scripts/module-create.sh
@@ -1,8 +1,9 @@
 #!/bin/bash
 # @P@/scripts/module-create.sh
 #
-#  (c)@YEAR@, @AUTHOR@. Released under the GNU GPL. See file
-#  COPYING for more information / terms of license.
+#  (c)2006, @AUTHOR@, <@EMAIL@>.
+#  Released under the GNU GPLv2. See file COPYING or
+#  http://www.gnu.org/copyleft/gpl.html for details.
 #
 
 # Creates a new source module.
@@ -44,3 +45,6 @@ fi
 
 source ${TEMPLATE}/instantiate
 
+
+# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
+# vim: expandtab:ts=4:sw=4
diff --git a/skel/scripts/module-rename.sh b/skel/scripts/module-rename.sh
index 63f68c6..0a43cab 100755
--- a/skel/scripts/module-rename.sh
+++ b/skel/scripts/module-rename.sh
@@ -1,8 +1,9 @@
 #!/bin/bash
 # @P@/scripts/module-rename.sh
 #
-#  (c)@YEAR@, @AUTHOR@. Released under the GNU GPL. See file
-#  COPYING for more information / terms of license.
+#  (c)2006, @AUTHOR@, <@EMAIL@>.
+#  Released under the GNU GPLv2. See file COPYING or
+#  http://www.gnu.org/copyleft/gpl.html for details.
 #
 
 # Renames a source module (e.g. "src/oldlib" -> "src/newlib") by running
@@ -44,3 +45,6 @@ echo "Moving ${OLD} -> ${NEW}"
 do_cmd mv ${OLD} ${NEW} || exit 1
 do_cmd find ${NEW} -type f -exec sed -e "s,${OLD},${NEW},g" -i {} \; || exit 1
 print_success "Done"
+
+# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
+# vim: expandtab:ts=4:sw=4
diff --git a/skel/scripts/release.sh b/skel/scripts/release.sh
index 8e45269..e592048 100755
--- a/skel/scripts/release.sh
+++ b/skel/scripts/release.sh
@@ -1,8 +1,9 @@
 #!/bin/bash
 # @P@/scripts/release.sh
 #
-#  (c)@YEAR@, @AUTHOR@. Released under the GNU GPL. See file
-#  COPYING for more information / terms of license.
+#  (c)2006, @AUTHOR@, <@EMAIL@>.
+#  Released under the GNU GPLv2. See file COPYING or
+#  http://www.gnu.org/copyleft/gpl.html for details.
 #
 
 # Prepares package for release. Expects the version number on the
@@ -74,3 +75,6 @@ gpg -a -b "${PKGNAME}-doc.tar.bz2"
 
 # clean up
 rm -rf "${PKGNAME}" "${PKGNAME}-doc"
+
+# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
+# vim: expandtab:ts=4:sw=4
diff --git a/skel/version b/skel/version
index 929834b..65b3506 100644
--- a/skel/version
+++ b/skel/version
@@ -1,12 +1,19 @@
 # @P@/version
 #
+#  (c)2006, @AUTHOR@, <@EMAIL@>.
+#  Released under the GNU GPLv2. See file COPYING or
+#  http://www.gnu.org/copyleft/gpl.html for details.
+#
 
 
 
 # VERSION contains the full version number of the library, which is 
 # expected to be in 'major.minor.micro' format. It can optionally be 
 # suffixed with a string.
-VERMAJOR=1
+VERMAJOR=0
 VERMINOR=0
-VERMICRO=2
+VERMICRO=0
 VEREXTRA=""
+
+# kate: replace-trailing-space-save true; space-indent true; tab-width 4;
+# vim: expandtab:ts=4:sw=4