diff --git a/tools/diag/README b/tools/diag/README
index 18f7b684eb5b..fb70f02a22b3 100644
--- a/tools/diag/README
+++ b/tools/diag/README
@@ -7,3 +7,4 @@ the integrity.
 Please make a subdir per program, and add a brief description to this file.
 
 ac 	check if the FreeBSD handbook is in sync with the committers list
+httpd-error  check for Web files which does not exists on your host 
diff --git a/tools/diag/httpd-error/httpd-error b/tools/diag/httpd-error/httpd-error
new file mode 100755
index 000000000000..b1ff405321c0
--- /dev/null
+++ b/tools/diag/httpd-error/httpd-error
@@ -0,0 +1,40 @@
+#!/bin/sh
+# Copyright (c) 1998 by Wolfram Schneider <wosch@FreeBSD.org>, Berlin.
+# <insert BSD Licence>
+#
+# httpd-error - check for Web files which does not exists on your host
+#
+# $Id$
+
+mode=${1}
+
+case "$mode" in
+    -host)
+	grep 'File does not exist$' |
+	    awk '{print $11}' | 
+	    sort | uniq -c | sort -nr | perl -npe 's/,$//'
+	;;
+    -filehits)
+	grep 'File does not exist$' |
+	    awk '{print $8}' | 
+	    sort | uniq -c | sort -nr 
+	;;
+    -user)
+	grep 'File does not exist$' |
+	    awk '{print $8}' | 
+	    sort | uniq -c | sort +1
+	;;
+    -userhits)
+	grep 'File does not exist$' |
+		awk '{print $8}' | sort |
+		perl -npe 's#/home/([^/]+)/public_html.*#/~$1/#;
+	                   s#/usr/local/www/data/.*#/usr/local/www/data/#' |
+		uniq -c | sort -nr
+	;;
+
+    *) echo 'usage $0 {-host|-filehits|-user|-userhits} < error.log' >&2
+       exit 1
+       ;;
+esac
+
+