diff --git a/.tx/config b/.tx/config
index ab11861127..c7b11a5f1a 100644
--- a/.tx/config
+++ b/.tx/config
@@ -56,8 +56,8 @@ source_lang = en
 type = PO
 
 [wagtail.wagtailforms]
-file_filter = wagtail/wagtailforms/locale/<lang>/LC_MESSAGES/django.po
-source_file = wagtail/wagtailforms/locale/en/LC_MESSAGES/django.po
+file_filter = wagtail/contrib/forms/locale/<lang>/LC_MESSAGES/django.po
+source_file = wagtail/contrib/forms/locale/en/LC_MESSAGES/django.po
 source_lang = en
 type = PO
 
diff --git a/docs/advanced_topics/settings.rst b/docs/advanced_topics/settings.rst
index dcfc99dde7..04e2df43b0 100644
--- a/docs/advanced_topics/settings.rst
+++ b/docs/advanced_topics/settings.rst
@@ -60,7 +60,7 @@ Apps (``settings.py``)
 
     'myapp',  # your own app
 
-    'wagtail.wagtailforms',
+    'wagtail.contrib.forms',
     'wagtail.wagtailredirects',
     'wagtail.embeds',
     'wagtail.sites',
@@ -502,7 +502,7 @@ These two files should reside in your project directory (``myproject/myproject/`
   INSTALLED_APPS = [
       'myapp',
 
-      'wagtail.wagtailforms',
+      'wagtail.contrib.forms',
       'wagtail.wagtailredirects',
       'wagtail.embeds',
       'wagtail.sites',
diff --git a/docs/getting_started/integrating_into_django.rst b/docs/getting_started/integrating_into_django.rst
index 306428877d..791671be4b 100644
--- a/docs/getting_started/integrating_into_django.rst
+++ b/docs/getting_started/integrating_into_django.rst
@@ -20,7 +20,7 @@ In your settings file, add the following apps to ``INSTALLED_APPS``:
 
 .. code-block:: python
 
-    'wagtail.wagtailforms',
+    'wagtail.contrib.forms',
     'wagtail.wagtailredirects',
     'wagtail.embeds',
     'wagtail.sites',
diff --git a/docs/reference/contrib/forms/customisation.rst b/docs/reference/contrib/forms/customisation.rst
index 805b4f916d..08f9d8d3fa 100644
--- a/docs/reference/contrib/forms/customisation.rst
+++ b/docs/reference/contrib/forms/customisation.rst
@@ -19,7 +19,7 @@ You can do this as shown below.
         InlinePanel, MultiFieldPanel
     )
     from wagtail.core.fields import RichTextField
-    from wagtail.wagtailforms.models import AbstractEmailForm, AbstractFormField
+    from wagtail.contrib.forms.models import AbstractEmailForm, AbstractFormField
 
 
     class FormField(AbstractFormField):
@@ -52,7 +52,7 @@ Custom form submission model
 If you need to save additional data, you can use a custom form submission model.
 To do this, you need to:
 
-* Define a model that extends ``wagtail.wagtailforms.models.AbstractFormSubmission``.
+* Define a model that extends ``wagtail.contrib.forms.models.AbstractFormSubmission``.
 * Override the ``get_submission_class`` and ``process_form_submission`` methods in your page model.
 
 Example:
@@ -70,7 +70,7 @@ Example:
         InlinePanel, MultiFieldPanel
     )
     from wagtail.core.fields import RichTextField
-    from wagtail.wagtailforms.models import AbstractEmailForm, AbstractFormField, AbstractFormSubmission
+    from wagtail.contrib.forms.models import AbstractEmailForm, AbstractFormField, AbstractFormSubmission
 
 
     class FormField(AbstractFormField):
@@ -131,7 +131,7 @@ The following example shows how to add a username to the CSV export:
         InlinePanel, MultiFieldPanel
     )
     from wagtail.core.fields import RichTextField
-    from wagtail.wagtailforms.models import AbstractEmailForm, AbstractFormField, AbstractFormSubmission
+    from wagtail.contrib.forms.models import AbstractEmailForm, AbstractFormField, AbstractFormSubmission
 
 
     class FormField(AbstractFormField):
@@ -209,7 +209,7 @@ Example:
         InlinePanel, MultiFieldPanel
     )
     from wagtail.core.fields import RichTextField
-    from wagtail.wagtailforms.models import AbstractEmailForm, AbstractFormField, AbstractFormSubmission
+    from wagtail.contrib.forms.models import AbstractEmailForm, AbstractFormField, AbstractFormSubmission
 
 
     class FormField(AbstractFormField):
@@ -305,7 +305,7 @@ The following example shows how to create a multi-step form.
         InlinePanel, MultiFieldPanel
     )
     from wagtail.core.fields import RichTextField
-    from wagtail.wagtailforms.models import AbstractEmailForm, AbstractFormField
+    from wagtail.contrib.forms.models import AbstractEmailForm, AbstractFormField
 
 
     class FormField(AbstractFormField):
@@ -456,7 +456,7 @@ First, you need to collect results as shown below:
         InlinePanel, MultiFieldPanel
     )
     from wagtail.core.fields import RichTextField
-    from wagtail.wagtailforms.models import AbstractEmailForm, AbstractFormField
+    from wagtail.contrib.forms.models import AbstractEmailForm, AbstractFormField
 
 
     class FormField(AbstractFormField):
diff --git a/docs/reference/contrib/forms/index.rst b/docs/reference/contrib/forms/index.rst
index c65d0391a2..b0f81540fa 100644
--- a/docs/reference/contrib/forms/index.rst
+++ b/docs/reference/contrib/forms/index.rst
@@ -14,13 +14,13 @@ The ``wagtailforms`` module allows you to set up single-page forms, such as a 'C
 Usage
 ~~~~~
 
-Add ``wagtail.wagtailforms`` to your ``INSTALLED_APPS``:
+Add ``wagtail.contrib.forms`` to your ``INSTALLED_APPS``:
 
 .. code-block:: python
 
     INSTALLED_APPS = [
        ...
-       'wagtail.wagtailforms',
+       'wagtail.contrib.forms',
     ]
 
 Within the ``models.py`` of one of your apps, create a model that extends ``wagtailforms.models.AbstractEmailForm``:
@@ -34,7 +34,7 @@ Within the ``models.py`` of one of your apps, create a model that extends ``wagt
         InlinePanel, MultiFieldPanel
     )
     from wagtail.core.fields import RichTextField
-    from wagtail.wagtailforms.models import AbstractEmailForm, AbstractFormField
+    from wagtail.contrib.forms.models import AbstractEmailForm, AbstractFormField
 
 
     class FormField(AbstractFormField):
@@ -94,7 +94,7 @@ Displaying form submission information
 
 .. code-block:: python
 
-    from wagtail.wagtailforms.edit_handlers import FormSubmissionsPanel
+    from wagtail.contrib.forms.edit_handlers import FormSubmissionsPanel
 
     class FormPage(AbstractEmailForm):
         # ...
diff --git a/docs/reference/pages/panels.rst b/docs/reference/pages/panels.rst
index 9836b49a5c..481bb01609 100644
--- a/docs/reference/pages/panels.rst
+++ b/docs/reference/pages/panels.rst
@@ -163,17 +163,17 @@ ImageChooserPanel
 FormSubmissionsPanel
 --------------------
 
-.. module:: wagtail.wagtailforms.edit_handlers
+.. module:: wagtail.contrib.forms.edit_handlers
 
 .. class:: FormSubmissionsPanel
 
-    This panel adds a single, read-only section in the edit interface for pages implementing the :class:`~wagtail.wagtailforms.models.AbstractForm` model.
+    This panel adds a single, read-only section in the edit interface for pages implementing the :class:`~wagtail.contrib.forms.models.AbstractForm` model.
     It includes the number of total submissions for the given form and also a link to the listing of submissions.
 
     .. code-block:: python
 
-        from wagtail.wagtailforms.models import AbstractForm
-        from wagtail.wagtailforms.edit_handlers import FormSubmissionsPanel
+        from wagtail.contrib.forms.models import AbstractForm
+        from wagtail.contrib.forms.edit_handlers import FormSubmissionsPanel
 
         class ContactFormPage(AbstractForm):
             content_panels = [
diff --git a/wagtail/wagtailforms/.gitignore b/wagtail/contrib/forms/.gitignore
similarity index 100%
rename from wagtail/wagtailforms/.gitignore
rename to wagtail/contrib/forms/.gitignore
diff --git a/wagtail/contrib/forms/__init__.py b/wagtail/contrib/forms/__init__.py
new file mode 100644
index 0000000000..62221ed2a9
--- /dev/null
+++ b/wagtail/contrib/forms/__init__.py
@@ -0,0 +1 @@
+default_app_config = 'wagtail.contrib.forms.apps.WagtailFormsAppConfig'
diff --git a/wagtail/wagtailforms/apps.py b/wagtail/contrib/forms/apps.py
similarity index 84%
rename from wagtail/wagtailforms/apps.py
rename to wagtail/contrib/forms/apps.py
index 98c4e4bf43..b7a77c680e 100644
--- a/wagtail/wagtailforms/apps.py
+++ b/wagtail/contrib/forms/apps.py
@@ -4,6 +4,6 @@ from django.apps import AppConfig
 
 
 class WagtailFormsAppConfig(AppConfig):
-    name = 'wagtail.wagtailforms'
+    name = 'wagtail.contrib.forms'
     label = 'wagtailforms'
     verbose_name = "Wagtail forms"
diff --git a/wagtail/wagtailforms/edit_handlers.py b/wagtail/contrib/forms/edit_handlers.py
similarity index 100%
rename from wagtail/wagtailforms/edit_handlers.py
rename to wagtail/contrib/forms/edit_handlers.py
diff --git a/wagtail/wagtailforms/forms.py b/wagtail/contrib/forms/forms.py
similarity index 100%
rename from wagtail/wagtailforms/forms.py
rename to wagtail/contrib/forms/forms.py
diff --git a/wagtail/wagtailforms/locale/ar/LC_MESSAGES/django.mo b/wagtail/contrib/forms/locale/ar/LC_MESSAGES/django.mo
similarity index 100%
rename from wagtail/wagtailforms/locale/ar/LC_MESSAGES/django.mo
rename to wagtail/contrib/forms/locale/ar/LC_MESSAGES/django.mo
diff --git a/wagtail/wagtailforms/locale/ar/LC_MESSAGES/django.po b/wagtail/contrib/forms/locale/ar/LC_MESSAGES/django.po
similarity index 100%
rename from wagtail/wagtailforms/locale/ar/LC_MESSAGES/django.po
rename to wagtail/contrib/forms/locale/ar/LC_MESSAGES/django.po
diff --git a/wagtail/wagtailforms/locale/ca/LC_MESSAGES/django.mo b/wagtail/contrib/forms/locale/ca/LC_MESSAGES/django.mo
similarity index 100%
rename from wagtail/wagtailforms/locale/ca/LC_MESSAGES/django.mo
rename to wagtail/contrib/forms/locale/ca/LC_MESSAGES/django.mo
diff --git a/wagtail/wagtailforms/locale/ca/LC_MESSAGES/django.po b/wagtail/contrib/forms/locale/ca/LC_MESSAGES/django.po
similarity index 100%
rename from wagtail/wagtailforms/locale/ca/LC_MESSAGES/django.po
rename to wagtail/contrib/forms/locale/ca/LC_MESSAGES/django.po
diff --git a/wagtail/wagtailforms/locale/cs/LC_MESSAGES/django.mo b/wagtail/contrib/forms/locale/cs/LC_MESSAGES/django.mo
similarity index 100%
rename from wagtail/wagtailforms/locale/cs/LC_MESSAGES/django.mo
rename to wagtail/contrib/forms/locale/cs/LC_MESSAGES/django.mo
diff --git a/wagtail/wagtailforms/locale/cs/LC_MESSAGES/django.po b/wagtail/contrib/forms/locale/cs/LC_MESSAGES/django.po
similarity index 100%
rename from wagtail/wagtailforms/locale/cs/LC_MESSAGES/django.po
rename to wagtail/contrib/forms/locale/cs/LC_MESSAGES/django.po
diff --git a/wagtail/wagtailforms/locale/cy/LC_MESSAGES/django.mo b/wagtail/contrib/forms/locale/cy/LC_MESSAGES/django.mo
similarity index 100%
rename from wagtail/wagtailforms/locale/cy/LC_MESSAGES/django.mo
rename to wagtail/contrib/forms/locale/cy/LC_MESSAGES/django.mo
diff --git a/wagtail/wagtailforms/locale/cy/LC_MESSAGES/django.po b/wagtail/contrib/forms/locale/cy/LC_MESSAGES/django.po
similarity index 100%
rename from wagtail/wagtailforms/locale/cy/LC_MESSAGES/django.po
rename to wagtail/contrib/forms/locale/cy/LC_MESSAGES/django.po
diff --git a/wagtail/wagtailforms/locale/de/LC_MESSAGES/django.mo b/wagtail/contrib/forms/locale/de/LC_MESSAGES/django.mo
similarity index 100%
rename from wagtail/wagtailforms/locale/de/LC_MESSAGES/django.mo
rename to wagtail/contrib/forms/locale/de/LC_MESSAGES/django.mo
diff --git a/wagtail/wagtailforms/locale/de/LC_MESSAGES/django.po b/wagtail/contrib/forms/locale/de/LC_MESSAGES/django.po
similarity index 100%
rename from wagtail/wagtailforms/locale/de/LC_MESSAGES/django.po
rename to wagtail/contrib/forms/locale/de/LC_MESSAGES/django.po
diff --git a/wagtail/wagtailforms/locale/el/LC_MESSAGES/django.mo b/wagtail/contrib/forms/locale/el/LC_MESSAGES/django.mo
similarity index 100%
rename from wagtail/wagtailforms/locale/el/LC_MESSAGES/django.mo
rename to wagtail/contrib/forms/locale/el/LC_MESSAGES/django.mo
diff --git a/wagtail/wagtailforms/locale/el/LC_MESSAGES/django.po b/wagtail/contrib/forms/locale/el/LC_MESSAGES/django.po
similarity index 100%
rename from wagtail/wagtailforms/locale/el/LC_MESSAGES/django.po
rename to wagtail/contrib/forms/locale/el/LC_MESSAGES/django.po
diff --git a/wagtail/wagtailforms/locale/en/LC_MESSAGES/django.mo b/wagtail/contrib/forms/locale/en/LC_MESSAGES/django.mo
similarity index 100%
rename from wagtail/wagtailforms/locale/en/LC_MESSAGES/django.mo
rename to wagtail/contrib/forms/locale/en/LC_MESSAGES/django.mo
diff --git a/wagtail/wagtailforms/locale/en/LC_MESSAGES/django.po b/wagtail/contrib/forms/locale/en/LC_MESSAGES/django.po
similarity index 100%
rename from wagtail/wagtailforms/locale/en/LC_MESSAGES/django.po
rename to wagtail/contrib/forms/locale/en/LC_MESSAGES/django.po
diff --git a/wagtail/wagtailforms/locale/es/LC_MESSAGES/django.mo b/wagtail/contrib/forms/locale/es/LC_MESSAGES/django.mo
similarity index 100%
rename from wagtail/wagtailforms/locale/es/LC_MESSAGES/django.mo
rename to wagtail/contrib/forms/locale/es/LC_MESSAGES/django.mo
diff --git a/wagtail/wagtailforms/locale/es/LC_MESSAGES/django.po b/wagtail/contrib/forms/locale/es/LC_MESSAGES/django.po
similarity index 100%
rename from wagtail/wagtailforms/locale/es/LC_MESSAGES/django.po
rename to wagtail/contrib/forms/locale/es/LC_MESSAGES/django.po
diff --git a/wagtail/wagtailforms/locale/fa/LC_MESSAGES/django.mo b/wagtail/contrib/forms/locale/fa/LC_MESSAGES/django.mo
similarity index 100%
rename from wagtail/wagtailforms/locale/fa/LC_MESSAGES/django.mo
rename to wagtail/contrib/forms/locale/fa/LC_MESSAGES/django.mo
diff --git a/wagtail/wagtailforms/locale/fa/LC_MESSAGES/django.po b/wagtail/contrib/forms/locale/fa/LC_MESSAGES/django.po
similarity index 100%
rename from wagtail/wagtailforms/locale/fa/LC_MESSAGES/django.po
rename to wagtail/contrib/forms/locale/fa/LC_MESSAGES/django.po
diff --git a/wagtail/wagtailforms/locale/fi/LC_MESSAGES/django.mo b/wagtail/contrib/forms/locale/fi/LC_MESSAGES/django.mo
similarity index 100%
rename from wagtail/wagtailforms/locale/fi/LC_MESSAGES/django.mo
rename to wagtail/contrib/forms/locale/fi/LC_MESSAGES/django.mo
diff --git a/wagtail/wagtailforms/locale/fi/LC_MESSAGES/django.po b/wagtail/contrib/forms/locale/fi/LC_MESSAGES/django.po
similarity index 100%
rename from wagtail/wagtailforms/locale/fi/LC_MESSAGES/django.po
rename to wagtail/contrib/forms/locale/fi/LC_MESSAGES/django.po
diff --git a/wagtail/wagtailforms/locale/fr/LC_MESSAGES/django.mo b/wagtail/contrib/forms/locale/fr/LC_MESSAGES/django.mo
similarity index 100%
rename from wagtail/wagtailforms/locale/fr/LC_MESSAGES/django.mo
rename to wagtail/contrib/forms/locale/fr/LC_MESSAGES/django.mo
diff --git a/wagtail/wagtailforms/locale/fr/LC_MESSAGES/django.po b/wagtail/contrib/forms/locale/fr/LC_MESSAGES/django.po
similarity index 100%
rename from wagtail/wagtailforms/locale/fr/LC_MESSAGES/django.po
rename to wagtail/contrib/forms/locale/fr/LC_MESSAGES/django.po
diff --git a/wagtail/wagtailforms/locale/gl/LC_MESSAGES/django.mo b/wagtail/contrib/forms/locale/gl/LC_MESSAGES/django.mo
similarity index 100%
rename from wagtail/wagtailforms/locale/gl/LC_MESSAGES/django.mo
rename to wagtail/contrib/forms/locale/gl/LC_MESSAGES/django.mo
diff --git a/wagtail/wagtailforms/locale/gl/LC_MESSAGES/django.po b/wagtail/contrib/forms/locale/gl/LC_MESSAGES/django.po
similarity index 100%
rename from wagtail/wagtailforms/locale/gl/LC_MESSAGES/django.po
rename to wagtail/contrib/forms/locale/gl/LC_MESSAGES/django.po
diff --git a/wagtail/wagtailforms/locale/he_IL/LC_MESSAGES/django.mo b/wagtail/contrib/forms/locale/he_IL/LC_MESSAGES/django.mo
similarity index 100%
rename from wagtail/wagtailforms/locale/he_IL/LC_MESSAGES/django.mo
rename to wagtail/contrib/forms/locale/he_IL/LC_MESSAGES/django.mo
diff --git a/wagtail/wagtailforms/locale/he_IL/LC_MESSAGES/django.po b/wagtail/contrib/forms/locale/he_IL/LC_MESSAGES/django.po
similarity index 100%
rename from wagtail/wagtailforms/locale/he_IL/LC_MESSAGES/django.po
rename to wagtail/contrib/forms/locale/he_IL/LC_MESSAGES/django.po
diff --git a/wagtail/wagtailforms/locale/hu/LC_MESSAGES/django.mo b/wagtail/contrib/forms/locale/hu/LC_MESSAGES/django.mo
similarity index 100%
rename from wagtail/wagtailforms/locale/hu/LC_MESSAGES/django.mo
rename to wagtail/contrib/forms/locale/hu/LC_MESSAGES/django.mo
diff --git a/wagtail/wagtailforms/locale/hu/LC_MESSAGES/django.po b/wagtail/contrib/forms/locale/hu/LC_MESSAGES/django.po
similarity index 100%
rename from wagtail/wagtailforms/locale/hu/LC_MESSAGES/django.po
rename to wagtail/contrib/forms/locale/hu/LC_MESSAGES/django.po
diff --git a/wagtail/wagtailforms/locale/id_ID/LC_MESSAGES/django.mo b/wagtail/contrib/forms/locale/id_ID/LC_MESSAGES/django.mo
similarity index 100%
rename from wagtail/wagtailforms/locale/id_ID/LC_MESSAGES/django.mo
rename to wagtail/contrib/forms/locale/id_ID/LC_MESSAGES/django.mo
diff --git a/wagtail/wagtailforms/locale/id_ID/LC_MESSAGES/django.po b/wagtail/contrib/forms/locale/id_ID/LC_MESSAGES/django.po
similarity index 100%
rename from wagtail/wagtailforms/locale/id_ID/LC_MESSAGES/django.po
rename to wagtail/contrib/forms/locale/id_ID/LC_MESSAGES/django.po
diff --git a/wagtail/wagtailforms/locale/is_IS/LC_MESSAGES/django.mo b/wagtail/contrib/forms/locale/is_IS/LC_MESSAGES/django.mo
similarity index 100%
rename from wagtail/wagtailforms/locale/is_IS/LC_MESSAGES/django.mo
rename to wagtail/contrib/forms/locale/is_IS/LC_MESSAGES/django.mo
diff --git a/wagtail/wagtailforms/locale/is_IS/LC_MESSAGES/django.po b/wagtail/contrib/forms/locale/is_IS/LC_MESSAGES/django.po
similarity index 100%
rename from wagtail/wagtailforms/locale/is_IS/LC_MESSAGES/django.po
rename to wagtail/contrib/forms/locale/is_IS/LC_MESSAGES/django.po
diff --git a/wagtail/wagtailforms/locale/it/LC_MESSAGES/django.mo b/wagtail/contrib/forms/locale/it/LC_MESSAGES/django.mo
similarity index 100%
rename from wagtail/wagtailforms/locale/it/LC_MESSAGES/django.mo
rename to wagtail/contrib/forms/locale/it/LC_MESSAGES/django.mo
diff --git a/wagtail/wagtailforms/locale/it/LC_MESSAGES/django.po b/wagtail/contrib/forms/locale/it/LC_MESSAGES/django.po
similarity index 100%
rename from wagtail/wagtailforms/locale/it/LC_MESSAGES/django.po
rename to wagtail/contrib/forms/locale/it/LC_MESSAGES/django.po
diff --git a/wagtail/wagtailforms/locale/ja/LC_MESSAGES/django.mo b/wagtail/contrib/forms/locale/ja/LC_MESSAGES/django.mo
similarity index 100%
rename from wagtail/wagtailforms/locale/ja/LC_MESSAGES/django.mo
rename to wagtail/contrib/forms/locale/ja/LC_MESSAGES/django.mo
diff --git a/wagtail/wagtailforms/locale/ja/LC_MESSAGES/django.po b/wagtail/contrib/forms/locale/ja/LC_MESSAGES/django.po
similarity index 100%
rename from wagtail/wagtailforms/locale/ja/LC_MESSAGES/django.po
rename to wagtail/contrib/forms/locale/ja/LC_MESSAGES/django.po
diff --git a/wagtail/wagtailforms/locale/ka/LC_MESSAGES/django.mo b/wagtail/contrib/forms/locale/ka/LC_MESSAGES/django.mo
similarity index 100%
rename from wagtail/wagtailforms/locale/ka/LC_MESSAGES/django.mo
rename to wagtail/contrib/forms/locale/ka/LC_MESSAGES/django.mo
diff --git a/wagtail/wagtailforms/locale/ka/LC_MESSAGES/django.po b/wagtail/contrib/forms/locale/ka/LC_MESSAGES/django.po
similarity index 100%
rename from wagtail/wagtailforms/locale/ka/LC_MESSAGES/django.po
rename to wagtail/contrib/forms/locale/ka/LC_MESSAGES/django.po
diff --git a/wagtail/wagtailforms/locale/ko/LC_MESSAGES/django.mo b/wagtail/contrib/forms/locale/ko/LC_MESSAGES/django.mo
similarity index 100%
rename from wagtail/wagtailforms/locale/ko/LC_MESSAGES/django.mo
rename to wagtail/contrib/forms/locale/ko/LC_MESSAGES/django.mo
diff --git a/wagtail/wagtailforms/locale/ko/LC_MESSAGES/django.po b/wagtail/contrib/forms/locale/ko/LC_MESSAGES/django.po
similarity index 100%
rename from wagtail/wagtailforms/locale/ko/LC_MESSAGES/django.po
rename to wagtail/contrib/forms/locale/ko/LC_MESSAGES/django.po
diff --git a/wagtail/wagtailforms/locale/lt/LC_MESSAGES/django.mo b/wagtail/contrib/forms/locale/lt/LC_MESSAGES/django.mo
similarity index 100%
rename from wagtail/wagtailforms/locale/lt/LC_MESSAGES/django.mo
rename to wagtail/contrib/forms/locale/lt/LC_MESSAGES/django.mo
diff --git a/wagtail/wagtailforms/locale/lt/LC_MESSAGES/django.po b/wagtail/contrib/forms/locale/lt/LC_MESSAGES/django.po
similarity index 100%
rename from wagtail/wagtailforms/locale/lt/LC_MESSAGES/django.po
rename to wagtail/contrib/forms/locale/lt/LC_MESSAGES/django.po
diff --git a/wagtail/wagtailforms/locale/lv/LC_MESSAGES/django.mo b/wagtail/contrib/forms/locale/lv/LC_MESSAGES/django.mo
similarity index 100%
rename from wagtail/wagtailforms/locale/lv/LC_MESSAGES/django.mo
rename to wagtail/contrib/forms/locale/lv/LC_MESSAGES/django.mo
diff --git a/wagtail/wagtailforms/locale/lv/LC_MESSAGES/django.po b/wagtail/contrib/forms/locale/lv/LC_MESSAGES/django.po
similarity index 100%
rename from wagtail/wagtailforms/locale/lv/LC_MESSAGES/django.po
rename to wagtail/contrib/forms/locale/lv/LC_MESSAGES/django.po
diff --git a/wagtail/wagtailforms/locale/nb/LC_MESSAGES/django.mo b/wagtail/contrib/forms/locale/nb/LC_MESSAGES/django.mo
similarity index 100%
rename from wagtail/wagtailforms/locale/nb/LC_MESSAGES/django.mo
rename to wagtail/contrib/forms/locale/nb/LC_MESSAGES/django.mo
diff --git a/wagtail/wagtailforms/locale/nb/LC_MESSAGES/django.po b/wagtail/contrib/forms/locale/nb/LC_MESSAGES/django.po
similarity index 100%
rename from wagtail/wagtailforms/locale/nb/LC_MESSAGES/django.po
rename to wagtail/contrib/forms/locale/nb/LC_MESSAGES/django.po
diff --git a/wagtail/wagtailforms/locale/nl/LC_MESSAGES/django.mo b/wagtail/contrib/forms/locale/nl/LC_MESSAGES/django.mo
similarity index 100%
rename from wagtail/wagtailforms/locale/nl/LC_MESSAGES/django.mo
rename to wagtail/contrib/forms/locale/nl/LC_MESSAGES/django.mo
diff --git a/wagtail/wagtailforms/locale/nl/LC_MESSAGES/django.po b/wagtail/contrib/forms/locale/nl/LC_MESSAGES/django.po
similarity index 100%
rename from wagtail/wagtailforms/locale/nl/LC_MESSAGES/django.po
rename to wagtail/contrib/forms/locale/nl/LC_MESSAGES/django.po
diff --git a/wagtail/wagtailforms/locale/nl_NL/LC_MESSAGES/django.mo b/wagtail/contrib/forms/locale/nl_NL/LC_MESSAGES/django.mo
similarity index 100%
rename from wagtail/wagtailforms/locale/nl_NL/LC_MESSAGES/django.mo
rename to wagtail/contrib/forms/locale/nl_NL/LC_MESSAGES/django.mo
diff --git a/wagtail/wagtailforms/locale/nl_NL/LC_MESSAGES/django.po b/wagtail/contrib/forms/locale/nl_NL/LC_MESSAGES/django.po
similarity index 100%
rename from wagtail/wagtailforms/locale/nl_NL/LC_MESSAGES/django.po
rename to wagtail/contrib/forms/locale/nl_NL/LC_MESSAGES/django.po
diff --git a/wagtail/wagtailforms/locale/pl/LC_MESSAGES/django.mo b/wagtail/contrib/forms/locale/pl/LC_MESSAGES/django.mo
similarity index 100%
rename from wagtail/wagtailforms/locale/pl/LC_MESSAGES/django.mo
rename to wagtail/contrib/forms/locale/pl/LC_MESSAGES/django.mo
diff --git a/wagtail/wagtailforms/locale/pl/LC_MESSAGES/django.po b/wagtail/contrib/forms/locale/pl/LC_MESSAGES/django.po
similarity index 100%
rename from wagtail/wagtailforms/locale/pl/LC_MESSAGES/django.po
rename to wagtail/contrib/forms/locale/pl/LC_MESSAGES/django.po
diff --git a/wagtail/wagtailforms/locale/pt_BR/LC_MESSAGES/django.mo b/wagtail/contrib/forms/locale/pt_BR/LC_MESSAGES/django.mo
similarity index 100%
rename from wagtail/wagtailforms/locale/pt_BR/LC_MESSAGES/django.mo
rename to wagtail/contrib/forms/locale/pt_BR/LC_MESSAGES/django.mo
diff --git a/wagtail/wagtailforms/locale/pt_BR/LC_MESSAGES/django.po b/wagtail/contrib/forms/locale/pt_BR/LC_MESSAGES/django.po
similarity index 100%
rename from wagtail/wagtailforms/locale/pt_BR/LC_MESSAGES/django.po
rename to wagtail/contrib/forms/locale/pt_BR/LC_MESSAGES/django.po
diff --git a/wagtail/wagtailforms/locale/pt_PT/LC_MESSAGES/django.mo b/wagtail/contrib/forms/locale/pt_PT/LC_MESSAGES/django.mo
similarity index 100%
rename from wagtail/wagtailforms/locale/pt_PT/LC_MESSAGES/django.mo
rename to wagtail/contrib/forms/locale/pt_PT/LC_MESSAGES/django.mo
diff --git a/wagtail/wagtailforms/locale/pt_PT/LC_MESSAGES/django.po b/wagtail/contrib/forms/locale/pt_PT/LC_MESSAGES/django.po
similarity index 100%
rename from wagtail/wagtailforms/locale/pt_PT/LC_MESSAGES/django.po
rename to wagtail/contrib/forms/locale/pt_PT/LC_MESSAGES/django.po
diff --git a/wagtail/wagtailforms/locale/ro/LC_MESSAGES/django.mo b/wagtail/contrib/forms/locale/ro/LC_MESSAGES/django.mo
similarity index 100%
rename from wagtail/wagtailforms/locale/ro/LC_MESSAGES/django.mo
rename to wagtail/contrib/forms/locale/ro/LC_MESSAGES/django.mo
diff --git a/wagtail/wagtailforms/locale/ro/LC_MESSAGES/django.po b/wagtail/contrib/forms/locale/ro/LC_MESSAGES/django.po
similarity index 100%
rename from wagtail/wagtailforms/locale/ro/LC_MESSAGES/django.po
rename to wagtail/contrib/forms/locale/ro/LC_MESSAGES/django.po
diff --git a/wagtail/wagtailforms/locale/ru/LC_MESSAGES/django.mo b/wagtail/contrib/forms/locale/ru/LC_MESSAGES/django.mo
similarity index 100%
rename from wagtail/wagtailforms/locale/ru/LC_MESSAGES/django.mo
rename to wagtail/contrib/forms/locale/ru/LC_MESSAGES/django.mo
diff --git a/wagtail/wagtailforms/locale/ru/LC_MESSAGES/django.po b/wagtail/contrib/forms/locale/ru/LC_MESSAGES/django.po
similarity index 100%
rename from wagtail/wagtailforms/locale/ru/LC_MESSAGES/django.po
rename to wagtail/contrib/forms/locale/ru/LC_MESSAGES/django.po
diff --git a/wagtail/wagtailforms/locale/sk_SK/LC_MESSAGES/django.mo b/wagtail/contrib/forms/locale/sk_SK/LC_MESSAGES/django.mo
similarity index 100%
rename from wagtail/wagtailforms/locale/sk_SK/LC_MESSAGES/django.mo
rename to wagtail/contrib/forms/locale/sk_SK/LC_MESSAGES/django.mo
diff --git a/wagtail/wagtailforms/locale/sk_SK/LC_MESSAGES/django.po b/wagtail/contrib/forms/locale/sk_SK/LC_MESSAGES/django.po
similarity index 100%
rename from wagtail/wagtailforms/locale/sk_SK/LC_MESSAGES/django.po
rename to wagtail/contrib/forms/locale/sk_SK/LC_MESSAGES/django.po
diff --git a/wagtail/wagtailforms/locale/sl/LC_MESSAGES/django.mo b/wagtail/contrib/forms/locale/sl/LC_MESSAGES/django.mo
similarity index 100%
rename from wagtail/wagtailforms/locale/sl/LC_MESSAGES/django.mo
rename to wagtail/contrib/forms/locale/sl/LC_MESSAGES/django.mo
diff --git a/wagtail/wagtailforms/locale/sl/LC_MESSAGES/django.po b/wagtail/contrib/forms/locale/sl/LC_MESSAGES/django.po
similarity index 100%
rename from wagtail/wagtailforms/locale/sl/LC_MESSAGES/django.po
rename to wagtail/contrib/forms/locale/sl/LC_MESSAGES/django.po
diff --git a/wagtail/wagtailforms/locale/sv/LC_MESSAGES/django.mo b/wagtail/contrib/forms/locale/sv/LC_MESSAGES/django.mo
similarity index 100%
rename from wagtail/wagtailforms/locale/sv/LC_MESSAGES/django.mo
rename to wagtail/contrib/forms/locale/sv/LC_MESSAGES/django.mo
diff --git a/wagtail/wagtailforms/locale/sv/LC_MESSAGES/django.po b/wagtail/contrib/forms/locale/sv/LC_MESSAGES/django.po
similarity index 100%
rename from wagtail/wagtailforms/locale/sv/LC_MESSAGES/django.po
rename to wagtail/contrib/forms/locale/sv/LC_MESSAGES/django.po
diff --git a/wagtail/wagtailforms/locale/tr/LC_MESSAGES/django.mo b/wagtail/contrib/forms/locale/tr/LC_MESSAGES/django.mo
similarity index 100%
rename from wagtail/wagtailforms/locale/tr/LC_MESSAGES/django.mo
rename to wagtail/contrib/forms/locale/tr/LC_MESSAGES/django.mo
diff --git a/wagtail/wagtailforms/locale/tr/LC_MESSAGES/django.po b/wagtail/contrib/forms/locale/tr/LC_MESSAGES/django.po
similarity index 100%
rename from wagtail/wagtailforms/locale/tr/LC_MESSAGES/django.po
rename to wagtail/contrib/forms/locale/tr/LC_MESSAGES/django.po
diff --git a/wagtail/wagtailforms/locale/uk/LC_MESSAGES/django.mo b/wagtail/contrib/forms/locale/uk/LC_MESSAGES/django.mo
similarity index 100%
rename from wagtail/wagtailforms/locale/uk/LC_MESSAGES/django.mo
rename to wagtail/contrib/forms/locale/uk/LC_MESSAGES/django.mo
diff --git a/wagtail/wagtailforms/locale/uk/LC_MESSAGES/django.po b/wagtail/contrib/forms/locale/uk/LC_MESSAGES/django.po
similarity index 100%
rename from wagtail/wagtailforms/locale/uk/LC_MESSAGES/django.po
rename to wagtail/contrib/forms/locale/uk/LC_MESSAGES/django.po
diff --git a/wagtail/wagtailforms/locale/zh_CN/LC_MESSAGES/django.mo b/wagtail/contrib/forms/locale/zh_CN/LC_MESSAGES/django.mo
similarity index 100%
rename from wagtail/wagtailforms/locale/zh_CN/LC_MESSAGES/django.mo
rename to wagtail/contrib/forms/locale/zh_CN/LC_MESSAGES/django.mo
diff --git a/wagtail/wagtailforms/locale/zh_CN/LC_MESSAGES/django.po b/wagtail/contrib/forms/locale/zh_CN/LC_MESSAGES/django.po
similarity index 100%
rename from wagtail/wagtailforms/locale/zh_CN/LC_MESSAGES/django.po
rename to wagtail/contrib/forms/locale/zh_CN/LC_MESSAGES/django.po
diff --git a/wagtail/wagtailforms/migrations/0001_initial.py b/wagtail/contrib/forms/migrations/0001_initial.py
similarity index 100%
rename from wagtail/wagtailforms/migrations/0001_initial.py
rename to wagtail/contrib/forms/migrations/0001_initial.py
diff --git a/wagtail/wagtailforms/migrations/0002_add_verbose_names.py b/wagtail/contrib/forms/migrations/0002_add_verbose_names.py
similarity index 100%
rename from wagtail/wagtailforms/migrations/0002_add_verbose_names.py
rename to wagtail/contrib/forms/migrations/0002_add_verbose_names.py
diff --git a/wagtail/wagtailforms/migrations/0003_capitalizeverbose.py b/wagtail/contrib/forms/migrations/0003_capitalizeverbose.py
similarity index 100%
rename from wagtail/wagtailforms/migrations/0003_capitalizeverbose.py
rename to wagtail/contrib/forms/migrations/0003_capitalizeverbose.py
diff --git a/wagtail/wagtailforms/migrations/__init__.py b/wagtail/contrib/forms/migrations/__init__.py
similarity index 100%
rename from wagtail/wagtailforms/migrations/__init__.py
rename to wagtail/contrib/forms/migrations/__init__.py
diff --git a/wagtail/wagtailforms/models.py b/wagtail/contrib/forms/models.py
similarity index 100%
rename from wagtail/wagtailforms/models.py
rename to wagtail/contrib/forms/models.py
diff --git a/wagtail/wagtailforms/templates/wagtailforms/confirm_delete.html b/wagtail/contrib/forms/templates/wagtailforms/confirm_delete.html
similarity index 100%
rename from wagtail/wagtailforms/templates/wagtailforms/confirm_delete.html
rename to wagtail/contrib/forms/templates/wagtailforms/confirm_delete.html
diff --git a/wagtail/wagtailforms/templates/wagtailforms/edit_handlers/form_responses_panel.html b/wagtail/contrib/forms/templates/wagtailforms/edit_handlers/form_responses_panel.html
similarity index 100%
rename from wagtail/wagtailforms/templates/wagtailforms/edit_handlers/form_responses_panel.html
rename to wagtail/contrib/forms/templates/wagtailforms/edit_handlers/form_responses_panel.html
diff --git a/wagtail/wagtailforms/templates/wagtailforms/index.html b/wagtail/contrib/forms/templates/wagtailforms/index.html
similarity index 100%
rename from wagtail/wagtailforms/templates/wagtailforms/index.html
rename to wagtail/contrib/forms/templates/wagtailforms/index.html
diff --git a/wagtail/wagtailforms/templates/wagtailforms/index_submissions.html b/wagtail/contrib/forms/templates/wagtailforms/index_submissions.html
similarity index 100%
rename from wagtail/wagtailforms/templates/wagtailforms/index_submissions.html
rename to wagtail/contrib/forms/templates/wagtailforms/index_submissions.html
diff --git a/wagtail/wagtailforms/templates/wagtailforms/list_forms.html b/wagtail/contrib/forms/templates/wagtailforms/list_forms.html
similarity index 100%
rename from wagtail/wagtailforms/templates/wagtailforms/list_forms.html
rename to wagtail/contrib/forms/templates/wagtailforms/list_forms.html
diff --git a/wagtail/wagtailforms/templates/wagtailforms/list_submissions.html b/wagtail/contrib/forms/templates/wagtailforms/list_submissions.html
similarity index 100%
rename from wagtail/wagtailforms/templates/wagtailforms/list_submissions.html
rename to wagtail/contrib/forms/templates/wagtailforms/list_submissions.html
diff --git a/wagtail/wagtailforms/templates/wagtailforms/results_forms.html b/wagtail/contrib/forms/templates/wagtailforms/results_forms.html
similarity index 100%
rename from wagtail/wagtailforms/templates/wagtailforms/results_forms.html
rename to wagtail/contrib/forms/templates/wagtailforms/results_forms.html
diff --git a/wagtail/wagtailforms/tests/__init__.py b/wagtail/contrib/forms/tests/__init__.py
similarity index 100%
rename from wagtail/wagtailforms/tests/__init__.py
rename to wagtail/contrib/forms/tests/__init__.py
diff --git a/wagtail/wagtailforms/tests/test_forms.py b/wagtail/contrib/forms/tests/test_forms.py
similarity index 99%
rename from wagtail/wagtailforms/tests/test_forms.py
rename to wagtail/contrib/forms/tests/test_forms.py
index 1d80581354..d623b81cf0 100644
--- a/wagtail/wagtailforms/tests/test_forms.py
+++ b/wagtail/contrib/forms/tests/test_forms.py
@@ -6,7 +6,7 @@ from django.test import TestCase
 
 from wagtail.tests.testapp.models import FormField, FormPage
 from wagtail.core.models import Page
-from wagtail.wagtailforms.forms import FormBuilder
+from wagtail.contrib.forms.forms import FormBuilder
 
 
 class TestFormBuilder(TestCase):
diff --git a/wagtail/wagtailforms/tests/test_models.py b/wagtail/contrib/forms/tests/test_models.py
similarity index 99%
rename from wagtail/wagtailforms/tests/test_models.py
rename to wagtail/contrib/forms/tests/test_models.py
index 61ccca489e..6701ec3102 100644
--- a/wagtail/wagtailforms/tests/test_models.py
+++ b/wagtail/contrib/forms/tests/test_models.py
@@ -9,8 +9,8 @@ from django.test import TestCase
 from wagtail.tests.testapp.models import CustomFormPageSubmission, FormField, JadeFormPage
 from wagtail.tests.utils import WagtailTestUtils
 from wagtail.core.models import Page
-from wagtail.wagtailforms.models import FormSubmission
-from wagtail.wagtailforms.tests.utils import make_form_page, make_form_page_with_custom_submission
+from wagtail.contrib.forms.models import FormSubmission
+from wagtail.contrib.forms.tests.utils import make_form_page, make_form_page_with_custom_submission
 
 
 class TestFormSubmission(TestCase):
diff --git a/wagtail/wagtailforms/tests/test_views.py b/wagtail/contrib/forms/tests/test_views.py
similarity index 99%
rename from wagtail/wagtailforms/tests/test_views.py
rename to wagtail/contrib/forms/tests/test_views.py
index 2e34353413..9587f74659 100644
--- a/wagtail/wagtailforms/tests/test_views.py
+++ b/wagtail/contrib/forms/tests/test_views.py
@@ -13,9 +13,9 @@ from wagtail.tests.utils import WagtailTestUtils
 from wagtail.admin.edit_handlers import get_form_for_model
 from wagtail.admin.forms import WagtailAdminPageForm
 from wagtail.core.models import Page
-from wagtail.wagtailforms.edit_handlers import FormSubmissionsPanel
-from wagtail.wagtailforms.models import FormSubmission
-from wagtail.wagtailforms.tests.utils import make_form_page, make_form_page_with_custom_submission
+from wagtail.contrib.forms.edit_handlers import FormSubmissionsPanel
+from wagtail.contrib.forms.models import FormSubmission
+from wagtail.contrib.forms.tests.utils import make_form_page, make_form_page_with_custom_submission
 
 
 class TestFormResponsesPanel(TestCase):
diff --git a/wagtail/wagtailforms/tests/utils.py b/wagtail/contrib/forms/tests/utils.py
similarity index 100%
rename from wagtail/wagtailforms/tests/utils.py
rename to wagtail/contrib/forms/tests/utils.py
diff --git a/wagtail/wagtailforms/urls.py b/wagtail/contrib/forms/urls.py
similarity index 89%
rename from wagtail/wagtailforms/urls.py
rename to wagtail/contrib/forms/urls.py
index 9fd85ebf3d..d2a7481905 100644
--- a/wagtail/wagtailforms/urls.py
+++ b/wagtail/contrib/forms/urls.py
@@ -2,7 +2,7 @@ from __future__ import absolute_import, unicode_literals
 
 from django.conf.urls import url
 
-from wagtail.wagtailforms import views
+from wagtail.contrib.forms import views
 
 app_name = 'wagtailforms'
 urlpatterns = [
diff --git a/wagtail/wagtailforms/views.py b/wagtail/contrib/forms/views.py
similarity index 97%
rename from wagtail/wagtailforms/views.py
rename to wagtail/contrib/forms/views.py
index 4f70cb5a8c..e2fe39a19a 100644
--- a/wagtail/wagtailforms/views.py
+++ b/wagtail/contrib/forms/views.py
@@ -12,8 +12,8 @@ from django.utils.translation import ungettext
 from wagtail.utils.pagination import paginate
 from wagtail.admin import messages
 from wagtail.core.models import Page
-from wagtail.wagtailforms.forms import SelectDateForm
-from wagtail.wagtailforms.models import get_forms_for_user
+from wagtail.contrib.forms.forms import SelectDateForm
+from wagtail.contrib.forms.models import get_forms_for_user
 
 
 def index(request):
diff --git a/wagtail/wagtailforms/wagtail_hooks.py b/wagtail/contrib/forms/wagtail_hooks.py
similarity index 89%
rename from wagtail/wagtailforms/wagtail_hooks.py
rename to wagtail/contrib/forms/wagtail_hooks.py
index 231ff502d6..b6a6dbb865 100644
--- a/wagtail/wagtailforms/wagtail_hooks.py
+++ b/wagtail/contrib/forms/wagtail_hooks.py
@@ -6,8 +6,8 @@ from django.utils.translation import ugettext_lazy as _
 
 from wagtail.admin.menu import MenuItem
 from wagtail.core import hooks
-from wagtail.wagtailforms import urls
-from wagtail.wagtailforms.models import get_forms_for_user
+from wagtail.contrib.forms import urls
+from wagtail.contrib.forms.models import get_forms_for_user
 
 
 @hooks.register('register_admin_urls')
diff --git a/wagtail/core/tests/test_page_queryset.py b/wagtail/core/tests/test_page_queryset.py
index 48ef491507..26baf60668 100644
--- a/wagtail/core/tests/test_page_queryset.py
+++ b/wagtail/core/tests/test_page_queryset.py
@@ -304,7 +304,7 @@ class TestPageQuerySet(TestCase):
         self.assertTrue(pages.filter(id=event.id).exists())
 
     def test_type_includes_subclasses(self):
-        from wagtail.wagtailforms.models import AbstractEmailForm
+        from wagtail.contrib.forms.models import AbstractEmailForm
         pages = Page.objects.type(AbstractEmailForm)
 
         # Check that all objects are instances of AbstractEmailForm
diff --git a/wagtail/project_template/project_name/settings/base.py b/wagtail/project_template/project_name/settings/base.py
index 49f5cbd73c..a02f18b0e0 100644
--- a/wagtail/project_template/project_name/settings/base.py
+++ b/wagtail/project_template/project_name/settings/base.py
@@ -29,7 +29,7 @@ INSTALLED_APPS = [
     'home',
     'search',
 
-    'wagtail.wagtailforms',
+    'wagtail.contrib.forms',
     'wagtail.wagtailredirects',
     'wagtail.embeds',
     'wagtail.sites',
diff --git a/wagtail/tests/settings.py b/wagtail/tests/settings.py
index 010da9c509..65d380418c 100644
--- a/wagtail/tests/settings.py
+++ b/wagtail/tests/settings.py
@@ -118,7 +118,7 @@ INSTALLED_APPS = (
     'wagtail.contrib.settings',
     'wagtail.contrib.modeladmin',
     'wagtail.contrib.table_block',
-    'wagtail.wagtailforms',
+    'wagtail.contrib.forms',
     'wagtail.search',
     'wagtail.embeds',
     'wagtail.images',
diff --git a/wagtail/tests/testapp/models.py b/wagtail/tests/testapp/models.py
index e42249efce..645051aa66 100644
--- a/wagtail/tests/testapp/models.py
+++ b/wagtail/tests/testapp/models.py
@@ -29,7 +29,7 @@ from wagtail.core.fields import RichTextField, StreamField
 from wagtail.core.models import Orderable, Page, PageManager, PageQuerySet
 from wagtail.documents.edit_handlers import DocumentChooserPanel
 from wagtail.documents.models import AbstractDocument, Document
-from wagtail.wagtailforms.models import AbstractEmailForm, AbstractFormField, AbstractFormSubmission
+from wagtail.contrib.forms.models import AbstractEmailForm, AbstractFormField, AbstractFormSubmission
 from wagtail.images.blocks import ImageChooserBlock
 from wagtail.images.edit_handlers import ImageChooserPanel
 from wagtail.images.models import AbstractImage, AbstractRendition, Image
diff --git a/wagtail/wagtailforms/__init__.py b/wagtail/wagtailforms/__init__.py
deleted file mode 100644
index 7be37b5f1c..0000000000
--- a/wagtail/wagtailforms/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-default_app_config = 'wagtail.wagtailforms.apps.WagtailFormsAppConfig'