diff --git a/modules/openstack_project/files/files/404s.sh b/modules/openstack_project/files/files/404s.sh
new file mode 100644
index 0000000000..83abadd3ee
--- /dev/null
+++ b/modules/openstack_project/files/files/404s.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+SOURCE_FILE=$1
+OUTPUT_DIR=$2
+INTERMEDIATE_FILE=$(mktemp)
+
+# Get just the lines with 404s in them
+grep ' 404 ' $SOURCE_FILE | sed -n -e 's/.*"GET \(\/.*\) HTTP\/1\.." 404 .*/\1/p' > $INTERMEDIATE_FILE
+
+if [ -f "$SOURCE_FILE.1" ] ; then
+    # We get roughly the last day's worth of logs by looking at the last two
+    # log files.
+    grep ' 404 ' $SOURCE_FILE.1 | sed -n -e 's/.*"GET \(\/.*\) HTTP\/1\.." 404 .*/\1/p' >> $INTERMEDIATE_FILE
+fi
+
+# Process those 404s to count them and return sorted by count
+sort $INTERMEDIATE_FILE | uniq -c | sort -rn | grep '\(html\|\/$\)' > $OUTPUT_DIR/$(date +%F).txt
+
+# cleanup
+rm $INTERMEDIATE_FILE
+find $OUTPUT_DIR -type f -name '*.txt' -mtime +30 -delete
diff --git a/modules/openstack_project/manifests/files.pp b/modules/openstack_project/manifests/files.pp
index f24dfe4248..a66f605e81 100644
--- a/modules/openstack_project/manifests/files.pp
+++ b/modules/openstack_project/manifests/files.pp
@@ -97,6 +97,28 @@ class openstack_project::files (
     notify => Service['httpd'],
   }
 
+  file {'/usr/local/bin/404s.sh':
+    ensure  => present,
+    owner   => 'root',
+    group   => 'root',
+    mode    => '0755',
+    content => 'puppet:///modules/openstack_project/files/404s.sh',
+  }
+  file {'/var/www/docs-404s':
+    ensure => directory,
+    owner   => 'root',
+    group   => 'root',
+    mode    => '0755',
+  }
+  cron {'generate_docs_404s':
+    # This seems to be about half an hour after apache rotates logs.
+    hour        => '7',
+    minute      => '0',
+    environment => 'PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin',
+    command     => '404s.sh /var/log/apache2/docs.openstack.org_access.log /var/www/docs-404s/',
+    require     => File['/usr/local/bin/404s.sh'],
+  }
+
   ###########################################################
   # docs.openstack.org
 
@@ -132,6 +154,7 @@ class openstack_project::files (
     before  => File['/etc/ssl/certs/docs.openstack.org.pem'],
   }
 
+
   ###########################################################
   # developer.openstack.org
 
diff --git a/modules/openstack_project/templates/files.vhost.erb b/modules/openstack_project/templates/files.vhost.erb
index b12e508748..99dc9d00b9 100644
--- a/modules/openstack_project/templates/files.vhost.erb
+++ b/modules/openstack_project/templates/files.vhost.erb
@@ -23,6 +23,12 @@ NameVirtualHost <%= @vhost_name %>:<%= @port %>
       Require all granted
     </Directory>
 
+    Alias /docs-404s /var/www/docs-404s
+    <Directory "/var/www/docs-404s">
+      Options +Indexes
+      Require all granted
+    </Directory>
+
     ErrorLog /var/log/<%= scope.lookupvar("httpd::params::apache_name") %>/<%= @name %>_error.log
     LogLevel warn
     CustomLog /var/log/<%= scope.lookupvar("httpd::params::apache_name") %>/<%= @name %>_access.log combined