diff --git a/dbtemplates/management.py b/dbtemplates/management.py
index 1dad385..647dd5d 100644
--- a/dbtemplates/management.py
+++ b/dbtemplates/management.py
@@ -18,15 +18,25 @@ def create_default_templates(app, created_models, verbosity):
             if verbosity >= 2:
                 print "Creating example database templates for error 404 and error 500"
 
-            template404 = Template(name="404.html",content="""
-            {% load i18n %}<h2>{% trans 'Page not found' %}</h2>
-            <p>{% trans "We're sorry, but the requested page could not be found." %}</p>""")
+            template404 = Template(name="404.html", content="""
+{% extends "base.html" %}
+{% load i18n %}
+{% block content %}
+    <h2>{% trans 'Page not found' %}</h2>
+    <p>{% trans "We're sorry, but the requested page could not be found." %}</p>
+{% endblock %}
+""")
             template404.save()
             template404.sites.add(site)
 
-            template500 = Template(name="500.html",content="""{% load i18n %}
-            <h1>{% trans 'Server Error <em>(500)</em>' %}</h1>
-            <p>{% trans "There's been an error." %}</p>""")
+            template500 = Template(name="500.html",content="""
+{% extends "base.html" %}
+{% load i18n %}
+{% block content %}
+    <h1>{% trans 'Server Error <em>(500)</em>' %}</h1>
+    <p>{% trans "There's been an error." %}</p>
+{% endblock %}
+""")
             template500.save()
             template500.sites.add(site)
 
diff --git a/setup.py b/setup.py
index 44a6bd1..e8fb4a0 100644
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
 from distutils.core import setup
 
 setup(name='dbtemplates',
-      version='0.2.3',
+      version='0.2.4',
       description='Template loader for database stored templates',
       author='Jannis Leidel',
       author_email='jannis@leidel.info',