diff --git a/HACKING b/HACKING
new file mode 100644
index 00000000..eef0be14
--- /dev/null
+++ b/HACKING
@@ -0,0 +1,24 @@
+HACKING
+
+DISCLAIMER: We realise the code doesn't necessarily follow all the rules.
+This is an attempt to establish a standard coding style for future
+development.
+
+Coding style guidelines
+-----------------------
+Column width: 79 columns or less within reason.
+
+Indentation: tabs (standard eight column width)
+Please don't add any mode lines. Adjust your editor to display tabs to your
+preferred width. Generally code should work with the standard eight column
+tabs.
+
+Try embedding as little HTML in the PHP as possible.
+Consider creating templates for HTML.
+
+MySQL queries should generally go into functions.
+
+Please submit uncompressed git-formatted patches to aur-dev@archlinux.org.
+When writing patches please keep unnecessary changes to a minimum.
+Smaller patches are much easier to review thus have a better chance of being
+pushed more quickly into the main repo.
diff --git a/web/html/account.php b/web/html/account.php
index b46ad554..5efc4016 100644
--- a/web/html/account.php
+++ b/web/html/account.php
@@ -156,5 +156,5 @@ echo " ";
echo "";
html_footer(AUR_VERSION);
-# vim: ts=2 sw=2 noet ft=php
+
?>
diff --git a/web/html/addvote.php b/web/html/addvote.php
index ef1c6c34..8e4df795 100644
--- a/web/html/addvote.php
+++ b/web/html/addvote.php
@@ -90,6 +90,5 @@ if ($atype == "Trusted User" OR $atype == "Developer") {
}
html_footer(AUR_VERSION);
-# vim: ts=2 sw=2 noet ft=php
?>
diff --git a/web/html/css/arch.css b/web/html/css/arch.css
index bdca5ec1..9dc630e1 100644
--- a/web/html/css/arch.css
+++ b/web/html/css/arch.css
@@ -452,5 +452,4 @@ textarea.vLargeTextField {
border-collapse: separate;
border-spacing: 0 15px;
}
-/* vim:ts=2:sw=2:et:enc=utf-8:
- * */
+
diff --git a/web/html/css/containers.css b/web/html/css/containers.css
index 95a5c45d..c0fb8773 100644
--- a/web/html/css/containers.css
+++ b/web/html/css/containers.css
@@ -181,5 +181,4 @@ input.button {
font-size: 12px;
padding: 2px;
}
-/* vim:ts=2:sw=2:et:enc=utf-8:
- * */
+
diff --git a/web/html/css/fonts.css b/web/html/css/fonts.css
index ae4b76f1..dc65070e 100644
--- a/web/html/css/fonts.css
+++ b/web/html/css/fonts.css
@@ -100,5 +100,4 @@ h1, h2, h3, h4 {
font-size: 16pt;
}
span.important { color: #f00; }
-/* vim:ts=2:sw=2:et:enc=utf-8:
- * */
+
diff --git a/web/html/hacker.php b/web/html/hacker.php
index d288a5e6..5087c292 100644
--- a/web/html/hacker.php
+++ b/web/html/hacker.php
@@ -13,5 +13,5 @@ print __("If this problem persists, please contact the site administrator.");
print "\n";
html_footer(AUR_VERSION);
-# vim: ts=2 sw=2 noet ft=php
+
?>
diff --git a/web/html/index.php b/web/html/index.php
index d0001eb1..7a95abfc 100644
--- a/web/html/index.php
+++ b/web/html/index.php
@@ -236,5 +236,4 @@ endif;
diff --git a/web/html/logout.php b/web/html/logout.php
index 0b275b86..c1c376c6 100644
--- a/web/html/logout.php
+++ b/web/html/logout.php
@@ -23,5 +23,4 @@ header('Location: index.php');
exit;
html_footer(AUR_VERSION);
-# vim: ts=2 sw=2 noet ft=php
?>
diff --git a/web/html/packages.php b/web/html/packages.php
index afee32e8..4cfe9c48 100644
--- a/web/html/packages.php
+++ b/web/html/packages.php
@@ -488,5 +488,5 @@ if ($_POST['action'] == "do_Flag" || isset($_POST['do_Flag'])) {
}
html_footer(AUR_VERSION);
-# vim: ts=2 sw=2 noet ft=php
+
?>
diff --git a/web/html/pkgedit.php b/web/html/pkgedit.php
index 5dbc0a98..610113a5 100644
--- a/web/html/pkgedit.php
+++ b/web/html/pkgedit.php
@@ -170,5 +170,4 @@ print __("You've found a bug if you see this....")."
\n";
html_footer(AUR_VERSION);
-# vim: ts=2 sw=2 noet ft=php
?>
diff --git a/web/html/pkgsubmit.php b/web/html/pkgsubmit.php
index 65706e8f..4d15ebe4 100644
--- a/web/html/pkgsubmit.php
+++ b/web/html/pkgsubmit.php
@@ -489,5 +489,5 @@ endif;
diff --git a/web/html/rss2.php b/web/html/rss2.php
index 9d198ccf..1f5c50cc 100644
--- a/web/html/rss2.php
+++ b/web/html/rss2.php
@@ -53,6 +53,4 @@ while ($row = mysql_fetch_assoc($result)) {
#save it so that useCached() can find it
$rss->saveFeed("RSS2.0","xml/newestpkg.xml",true);
-# $Id$
-# vim: ts=2 sw=2 noet ft=php
?>
diff --git a/web/html/template.php b/web/html/template.php
index 6a158de8..11e05e0b 100644
--- a/web/html/template.php
+++ b/web/html/template.php
@@ -15,10 +15,6 @@ html_header(); # print out the HTML header
print __("Hi, this is worth reading!")."
\n";
-html_footer(AUR_VERSION); # Use the $Id$ keyword
- # NOTE: when checking in a new file, use
- # 'svn propset svn:keywords "Id" filename.php'
- # to tell svn to expand the "Id" keyword.
+html_footer(AUR_VERSION);
-# vim: ts=2 sw=2 et ft=php
?>
diff --git a/web/html/testpo.php b/web/html/testpo.php
index 75da92ad..a8a63375 100644
--- a/web/html/testpo.php
+++ b/web/html/testpo.php
@@ -42,5 +42,4 @@ print __("Hello, again!")."
\n";
print "\n";
print "\n