diff --git a/.gitignore b/.gitignore
index 472e3810..87a55bc2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,10 @@
 src/octoprint/templates/_data/AUTHORS.md
 src/octoprint/templates/_data/CHANGELOG.md
+src/octoprint/templates/_data/SPONSORS.md
 src/octoprint/templates/_data/THIRDPARTYLICENSES.md
 
+devtools
+
 *.tar.bz2
 *.tar.gz
 *.7z
diff --git a/SPONSORS.md b/SPONSORS.md
new file mode 100644
index 00000000..eac40941
--- /dev/null
+++ b/SPONSORS.md
@@ -0,0 +1,31 @@
+# Sponsors
+
+Development of this version of OctoPrint wouldn't have been possible without
+[financial support by the community](http://octoprint.org/support-octoprint/) -
+thanks to everyone who contributed!
+
+## Patreon Patrons
+
+  * 3D Moniak
+  * Arnljot Arntsen
+  * Aurelio Bernal Ramírez
+  * D Brian Kimmel
+  * Doug Johnson
+  * E3D BigBox
+  * Erik de Bruijn
+  * Ernesto Martinez
+  * Exovite 
+  * georgeroblesjr 
+  * Gregor Luetolf
+  * Kale Stedman
+  * Makespace Madrid
+  * Masayoshi Mitsui
+  * Miguel Angel Salmeron
+  * Noe Ruiz
+  * Roy Cortes
+  * Samer Najia
+  * Stefan Krister
+  * Sven Mueller
+  * Tom 
+
+and 321 more wonderful people pledging on the [Patreon campaign](https://patreon.com/foosel)!
\ No newline at end of file
diff --git a/setup.py b/setup.py
index 0bc0ee91..6479414a 100644
--- a/setup.py
+++ b/setup.py
@@ -113,6 +113,7 @@ def get_cmdclass():
 		"octoprint/templates/_data": [
 			"AUTHORS.md",
 			"CHANGELOG.md",
+			"SPONSORS.md",
 			"THIRDPARTYLICENSES.md",
 		]
 	}, cmdclass["build_py"] if "build_py" in cmdclass else _build_py)
diff --git a/src/octoprint/server/__init__.py b/src/octoprint/server/__init__.py
index e94c6a72..75bfc579 100644
--- a/src/octoprint/server/__init__.py
+++ b/src/octoprint/server/__init__.py
@@ -717,7 +717,7 @@ class Server(object):
 		loaders = [app.jinja_loader, filesystem_loader]
 		if octoprint.util.is_running_from_source():
 			root = os.path.abspath(os.path.join(os.path.dirname(__file__), "../../.."))
-			allowed = ["AUTHORS.md", "CHANGELOG.md", "THIRDPARTYLICENSES.md"]
+			allowed = ["AUTHORS.md", "CHANGELOG.md", "SPONSORS.md", "THIRDPARTYLICENSES.md"]
 
 			class SourceRootFilesystemLoader(jinja2.FileSystemLoader):
 				def __init__(self, template_filter, prefix, *args, **kwargs):
diff --git a/src/octoprint/server/views.py b/src/octoprint/server/views.py
index 93b19dea..4b2583d9 100644
--- a/src/octoprint/server/views.py
+++ b/src/octoprint/server/views.py
@@ -187,7 +187,8 @@ def index():
 		license=(gettext("OctoPrint License"), dict(template="dialogs/about/license.jinja2", _div="about_license", custom_bindings=False)),
 		thirdparty=(gettext("Third Party Licenses"), dict(template="dialogs/about/thirdparty.jinja2", _div="about_thirdparty", custom_bindings=False)),
 		authors=(gettext("Authors"), dict(template="dialogs/about/authors.jinja2", _div="about_authors", custom_bindings=False)),
-		changelog=(gettext("Changelog"), dict(template="dialogs/about/changelog.jinja2", _div="about_changelog", custom_bindings=False))
+		changelog=(gettext("Changelog"), dict(template="dialogs/about/changelog.jinja2", _div="about_changelog", custom_bindings=False)),
+		sponsors=(gettext("Sponsors"), dict(template="dialogs/about/sponsors.jinja2", _div="about_sponsors", custom_bindings=False))
 	)
 
 	# extract data from template plugins
diff --git a/src/octoprint/settings.py b/src/octoprint/settings.py
index 66e628ef..b125c82e 100644
--- a/src/octoprint/settings.py
+++ b/src/octoprint/settings.py
@@ -218,7 +218,7 @@ default_settings = {
 					"section_octoprint", "server", "folders", "appearance", "logs", "plugin_pluginmanager", "plugin_softwareupdate"
 				],
 				"usersettings": ["access", "interface"],
-				"about": ["about", "license", "thirdparty", "plugin_pluginmanager", "authors", "changelog"],
+				"about": ["about", "sponsors", "authors", "changelog", "license", "thirdparty", "plugin_pluginmanager"],
 				"generic": []
 			},
 			"disabled": {
diff --git a/src/octoprint/templates/dialogs/about/about.jinja2 b/src/octoprint/templates/dialogs/about/about.jinja2
index 3803eba2..947c56ac 100644
--- a/src/octoprint/templates/dialogs/about/about.jinja2
+++ b/src/octoprint/templates/dialogs/about/about.jinja2
@@ -11,7 +11,7 @@
 </ul>
 
 <p>
-    OctoPrint is sponsored and maintained by <a href="http://www.bq.com">BQ</a>.
+    <strong>OctoPrint is sponsored by a lot of awesome people. Please see "Sponsors" to the left.</strong>
 </p>
 
 <p>
@@ -44,6 +44,5 @@
 </p>
 
 <p><small>
-    The OctoPrint brand is a registered trademark of MundoReader, S.L
-    (<a href="http://octoprint.org/trademark-rules/">Trademark Rules</a>).
+    "OctoPrint" is a registered trademark
 </small></p>
diff --git a/src/octoprint/templates/dialogs/about/sponsors.jinja2 b/src/octoprint/templates/dialogs/about/sponsors.jinja2
new file mode 100644
index 00000000..1870c618
--- /dev/null
+++ b/src/octoprint/templates/dialogs/about/sponsors.jinja2
@@ -0,0 +1 @@
+{% filter markdown %}{% filter offset_markdown_headers(2) %}{% include "_data/SPONSORS.md" ignore missing %}{% endfilter %}{% endfilter %}