diff --git a/cookiecutter.json b/cookiecutter.json
index 0bc2b90e2..e72ce32cb 100644
--- a/cookiecutter.json
+++ b/cookiecutter.json
@@ -6,6 +6,7 @@
     "description": "A short description of the project.",
     "domain_name": "example.com",
     "version": "0.1.0",
+    "use_bumpversion": "y",
     "timezone": "UTC",
     "use_whitenoise": "y",
     "use_celery": "n",
diff --git a/{{cookiecutter.project_slug}}/.bumpversion.cfg b/{{cookiecutter.project_slug}}/.bumpversion.cfg
new file mode 100644
index 000000000..416d9642a
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/.bumpversion.cfg
@@ -0,0 +1,22 @@
+[bumpversion]
+current_version = {{ cookiecutter.version }}
+parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-(?P<pre>\d+)\.(?P<prenum>\d+))?
+serialize =
+	{major}.{minor}.{patch}-{pre}.{prenum}
+	{major}.{minor}.{patch}
+commit = True
+tag = True
+tag_name = {new_version}
+
+[bumpversion:file:./package.json]
+search = "version": "{current_version}"
+replace = "version": "{new_version}"
+
+[bumpversion:file:./{{cookiecutter.project_slug}}/__init__.py]
+search = __version__ = '{current_version}'
+replace = __version__ = '{new_version}'
+
+[bumpversion:file:./docs/conf.py]
+search = release = '{current_version}'
+replace = release = '{new_version}'
+
diff --git a/{{cookiecutter.project_slug}}/docs/conf.py b/{{cookiecutter.project_slug}}/docs/conf.py
index 03cbe319b..6534993fd 100644
--- a/{{cookiecutter.project_slug}}/docs/conf.py
+++ b/{{cookiecutter.project_slug}}/docs/conf.py
@@ -50,10 +50,10 @@ copyright = """{% now 'utc', '%Y' %}, {{ cookiecutter.author_name }}"""
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
-# The short X.Y version.
-version = '0.1'
 # The full version, including alpha/beta/rc tags.
-release = '0.1'
+release = '{{ cookiecutter.version }}'
+# The short X.Y version.
+version = '.'.join(release.split('.')[:2])
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index 8093d77c7..6b4b9ca1e 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -17,3 +17,6 @@ ipdb==0.10.2
 
 pytest-django==3.1.2
 pytest-sugar==0.8.0
+{% if cookiecutter.use_bumpversion == 'y' -%}
+bumpversion==0.5.3
+{%- endif %}