diff --git a/error.php b/error.php
index c66a3fd44..72bec2694 100644
--- a/error.php
+++ b/error.php
@@ -15,6 +15,7 @@
 // Ensure that our environment is set up
 include_once $_SERVER['DOCUMENT_ROOT'] . '/include/prepend.inc';
 include_once $_SERVER['DOCUMENT_ROOT'] . '/include/loadavg.inc';
+include_once $_SERVER['DOCUMENT_ROOT'] . '/include/errors.inc';
 
 // Get URI for this request (without the leading slash, and
 // without any query string attached)
@@ -25,7 +26,7 @@ $URI = urldecode(preg_replace("!(\\?.*$)!", "", $URI));
 
 // ============================================================================
 // For images, display a 404 automatically (no redirect)
-if (preg_match("!\\.(pdf|gif|jpg|png)$!i", $URI)) { make404(); }
+if (preg_match("!\\.(pdf|gif|jpg|png)$!i", $URI)) { error_404(); }
 
 // ============================================================================
 // BC: handle .php3 files that were renamed to .php
@@ -234,7 +235,7 @@ if ($try) {
 // ============================================================================
 // 404 page for manual pages (eg. not built language)
 if (strpos($URI, "manual/") === 0) {
-    manual404();
+    error_404_manual();
 }
 
 // ============================================================================
@@ -246,50 +247,4 @@ mirror_redirect(
     '&pattern=' . urlencode(substr($_SERVER['REQUEST_URI'], 1))
 );
 
-// A 'good looking' 404 error message page
-function make404()
-{
-    global $_SERVER;
-    status_header(404);
-    site_header('404 Not Found', array("noindex"));
-    echo "<h1>Not Found</h1>\n" .
-         "<p><strong>" . htmlspecialchars($_SERVER['REQUEST_URI']) .
-         "</strong> not found on this server.</p>\n";
-    site_footer();
-    exit;
-}
-
-// A 'good looking' 404 error message page for manual pages
-function manual404()
-{
-    global $_SERVER;
-    status_header(404);
-    site_header('404 Not Found', array("noindex"));
-    echo "<h1>Not Found</h1>\n" .
-         "<p>The manual page you are looking for (<strong>" .
-         htmlspecialchars($_SERVER['REQUEST_URI']) .
-         "</strong>) is not available on this server right now. " .
-         "Please check back later, or if the problem persist, " .
-         "<a href=\"/copyright.php#contact\">contact the webmasters</a>.</p>\n";
-    site_footer();
-    exit;
-}
-
-// Send out a proper status header
-function status_header($num)
-{
-    // Set status text
-    switch ($num) {
-        case 404: $status = "Not Found"; break;
-        case 200: $status = "OK"; break;
-        default: return FALSE;
-    }
-    
-    // BC code for PHP < 4.3.0
-    @header("HTTP/1.1 $num $status");
-    @header("Status: $num $status", TRUE, $num);
-    
-    return TRUE;
-}
-
-?>
+?>
\ No newline at end of file
diff --git a/include/errors.inc b/include/errors.inc
new file mode 100644
index 000000000..d37ca2352
--- /dev/null
+++ b/include/errors.inc
@@ -0,0 +1,66 @@
+<?php
+// $Id$
+
+/*
+  This script provides functions to print out
+  error messages for users in case something is
+  not available.
+*/
+
+// A 'good looking' 404 error message page
+function error_404()
+{
+    status_header(404);
+    site_header('404 Not Found', array("noindex"));
+    echo "<h1>Not Found</h1>\n" .
+         "<p><strong>" . htmlspecialchars($_SERVER['REQUEST_URI']) .
+         "</strong> not found on this server.</p>\n";
+    site_footer();
+    exit;
+}
+
+// A 'good looking' 404 error message page for manual pages
+function error_404_manual()
+{
+    status_header(404);
+    site_header('404 Not Found', array("noindex"));
+    echo "<h1>Not Found</h1>\n" .
+         "<p>The manual page you are looking for (<strong>" .
+         htmlspecialchars($_SERVER['REQUEST_URI']) .
+         "</strong>) is not available on this server right now. " .
+         "Please check back later, or if the problem persist, " .
+         "<a href=\"/copyright.php#contact\">contact the webmasters</a>.</p>\n";
+    site_footer();
+    exit;
+}
+
+// This service is not working right now
+function error_noservice()
+{
+    site_header('Service not working', array("noindex"));
+    echo "<h1>Service not working</h1>\n" .
+         "<p>The service you tried to access with the URL: <strong>" .
+         htmlspecialchars($_SERVER['REQUEST_URI']) .
+         "</strong> is not available on this server right now. " .
+         "Please check back later, or if the problem persist, " .
+         "<a href=\"/copyright.php#contact\">contact the webmasters</a>.</p>\n";
+    site_footer();
+    exit;
+}
+
+// Send out a proper status header
+function status_header($num)
+{
+    // Set status text
+    switch ($num) {
+        case 404: $status = "Not Found"; break;
+        case 200: $status = "OK"; break;
+        default: return FALSE;
+    }
+    
+    // BC code for PHP < 4.3.0
+    @header("HTTP/1.1 $num $status");
+    @header("Status: $num $status", TRUE, $num);
+    
+    return TRUE;
+}