diff --git a/404.html b/404.html
new file mode 100644
index 0000000..6c1c1ce
--- /dev/null
+++ b/404.html
@@ -0,0 +1,26 @@
+{% extends "base.html" %}
+{% load i18n %}
+
+{% comment %}
+
+  layerindex-web - 404 page template
+
+  Copyright (C) 2013 Intel Corporation
+  Licensed under the MIT license, see COPYING.MIT for details
+
+{% endcomment %}
+
+
+<!--
+{% block title %}OpenEmbedded metadata index - page not found{% endblock %}
+-->
+
+{% block content %}
+{% autoescape on %}
+
+<p>The page you requested was not found.</p>
+
+<p><a href="{% url layer_list %}">Return to the index</a></p>
+
+{% endautoescape %}
+{% endblock %}
\ No newline at end of file
diff --git a/500.html b/500.html
new file mode 100644
index 0000000..0f2f448
--- /dev/null
+++ b/500.html
@@ -0,0 +1,11 @@
+<html>
+<head>
+<title>Internal server error</title>
+</head>
+
+<body>
+<h1>Internal server error</h1>
+
+<p>Something went wrong. The error has been logged, please check back later.</p>
+</body>
+</html>
\ No newline at end of file
