diff --git a/mod.php b/mod.php
index b5ef4438c..af0d93f83 100644
--- a/mod.php
+++ b/mod.php
@@ -1,14 +1,56 @@
 <?php
+// $Id$
 
+/*
+ This page supports the PHP.net automoderation system
+ with enabling users to confirm their emails via the web.
+ This script only need to run on www.php.net.
+*/
+
+$_SERVER['BASE_PAGE'] = 'mod.php';
+include_once $_SERVER['DOCUMENT_ROOT'] . '/include/prepend.inc';
+
+// Only run on www.php.net
+if ($MYSITE != "http://www.php.net/") { exit; }
+
+site_header("Email confirmation");
+
+// These sites are handled by automoderation
 $sites = array("php.net", "lists.php.net");
 
+// Get data from the URL
 list($none, $site, $token, $sender) = explode("/", $_SERVER["PATH_INFO"]);
 
+// Error in input data
 if ($sender == "" || strlen($token) < 32 || !isset($sites[$site])) {
-  echo "Sorry, the URL is incomplete. Please verify that you used the complete URL even if it spans multiple lines.";
-  exit;
+    echo <<<ERROR
+<h1>Email confirmation failed</h1>
+
+<p class="formerror">
+ Sorry, the URL is incomplete. Please verify that you used the
+ complete URL even if it spans multiple lines.
+</p>
+ERROR;
 }
 
-mail("confirm@".$sites[$site], "confirm", "[confirm: $token $sender]", "From: $sender");
+// Data OK, send confirmation mail
+else {
+    mail(
+        "confirm@" . $sites[$site],
+        "confirm",
+        "[confirm: $token $sender]",
+        "From: $sender"
+    );
 
-echo "Thanks for confirming your email address. No further action is required on your part.";
+    echo <<<THANKS
+<h1>Email confirmation successful</h1>
+
+<p> 
+ Thanks for confirming your email address. No further
+ action is required on your part.
+</p>
+THANKS;
+
+}
+
+site_footer();