diff --git a/django/contrib/flatpages/models.py b/django/contrib/flatpages/models.py
index ddd5678379..d61e9a3b1c 100644
--- a/django/contrib/flatpages/models.py
+++ b/django/contrib/flatpages/models.py
@@ -8,7 +8,7 @@ class FlatPage(models.Model):
     url = models.CharField(_('URL'), max_length=100, validator_list=[validators.isAlphaNumericURL], db_index=True,
         help_text=_("Example: '/about/contact/'. Make sure to have leading and trailing slashes."))
     title = models.CharField(_('title'), max_length=200)
-    content = models.TextField(_('content'))
+    content = models.TextField(_('content'), blank=True)
     enable_comments = models.BooleanField(_('enable comments'))
     template_name = models.CharField(_('template name'), max_length=70, blank=True,
         help_text=_("Example: 'flatpages/contact_page.html'. If this isn't provided, the system will use 'flatpages/default.html'."))
diff --git a/docs/flatpages.txt b/docs/flatpages.txt
index a538217642..f1a354c653 100644
--- a/docs/flatpages.txt
+++ b/docs/flatpages.txt
@@ -14,9 +14,14 @@ custom Django application.
 A flatpage can use a custom template or a default, systemwide flatpage
 template. It can be associated with one, or multiple, sites.
 
+**New in Django development version**
+
+The content field may optionally be left blank if you prefer to put your 
+content in a custom template.
+
 Here are some examples of flatpages on Django-powered sites:
 
-    * http://www.chicagocrime.org/about/
+    * http://www.everyblock.com/about/
     * http://www.lawrence.com/about/contact/
 
 Installation