diff --git a/website/source/community-plugins.html.md b/website/source/community-plugins.html.md
index 537cdc3ca..e85778870 100644
--- a/website/source/community-plugins.html.md
+++ b/website/source/community-plugins.html.md
@@ -1,17 +1,19 @@
---
layout: "community"
-page_title: "Community Maintained Plugins"
-sidebar_current: "community-plugins"
+page_title: "Community vs HashiCorp Maintained Plugins"
+sidebar_current: "community-or-hashicorp-plugins"
description: |-
Packer maintains these core plugins.
---
-# Community Maintained Plugins
+# HashiCorp Maintained Plugins
The following plugins (i.e. Builders, Provisioners, and Post-Processors) are
maintained by HashiCorp. Any plugins not on this list are maintained by the
community, and not actively contributed to by HashiCorp, although they are
-still distributed with Packer.
+still distributed with Packer. If you are interested in seeing features or
+bugfixes to these plugins, please consider making a pull request, or asking the
+HashiCorp maintainters for advice on how to get started contributing.
## Builders
diff --git a/website/source/community-tools.html.md b/website/source/community-tools.html.md.erb
similarity index 77%
rename from website/source/community-tools.html.md
rename to website/source/community-tools.html.md.erb
index 1832281a2..31cee54eb 100644
--- a/website/source/community-tools.html.md
+++ b/website/source/community-tools.html.md.erb
@@ -27,28 +27,9 @@ If you have built a plugin and would like to add it to this community list,
please make a pull request to the website so that we can document your
contribution here!
-### Community Builders
+<%= partial "partials/builders/community_builders" %>
-- [ARM builder](https://github.com/solo-io/packer-builder-arm-image) - A builder
- for creating ARM images
-
-- [vSphere builder](https://github.com/jetbrains-infra/packer-builder-vsphere) -
- A builder for interacting directly with the vSphere API rather than the esx
- host directly.
-
-- [Vultr builder](https://github.com/vultr/packer-builder-vultr) - A builder
- for creating [Vultr](https://www.vultr.com/) snapshots.
-
-
-### Community Provisioners
-
-- [Comment Provisioner](https://github.com/SwampDragons/packer-provisioner-comment) -
- Example provisioner that allows you to annotate your build with bubble-text
- comments.
-
-- [Windows Update provisioner](https://github.com/rgl/packer-provisioner-windows-update) -
- A provisioner for gracefully handling windows updates and the reboots they
- cause.
+<%= partial "partials/provisioners/community_provisioners" %>
## Templates
diff --git a/website/source/docs/builders/community-supported.html.md.erb b/website/source/docs/builders/community-supported.html.md.erb
new file mode 100644
index 000000000..7c8c0ea44
--- /dev/null
+++ b/website/source/docs/builders/community-supported.html.md.erb
@@ -0,0 +1,16 @@
+---
+description: |
+ Community-maintained builders are not part of the core Packer binary, but
+ can run alongside Packer with minimal extra effort.
+layout: docs
+page_title: 'Community - Builders'
+sidebar_current: 'docs-builders-community'
+---
+
+# Community Builders
+
+The following builders are developed and maintained by various members of the
+Packer community, not by HashiCorp. For more information on how to use community
+builders, see our docs on [extending Packer](/docs/extending/index.html).
+
+<%= partial "partials/builders/community_builders" %>
\ No newline at end of file
diff --git a/website/source/docs/provisioners/community-supported.html.md.erb b/website/source/docs/provisioners/community-supported.html.md.erb
new file mode 100644
index 000000000..438151cb2
--- /dev/null
+++ b/website/source/docs/provisioners/community-supported.html.md.erb
@@ -0,0 +1,16 @@
+---
+description: |
+ Community-maintained provisioners are not part of the core Packer binary, but
+ can run alongside Packer with minimal extra effort.
+layout: docs
+page_title: 'Community - Provisioners'
+sidebar_current: 'docs-provisioners-community'
+---
+
+# Community Provisioners
+
+The following provisioners are developed and maintained by various members of the
+Packer community, not by HashiCorp. For more information on how to use community
+provisioners, see our docs on [extending Packer](/docs/extending/index.html).
+
+<%= partial "partials/provisioners/community_provisioners" %>
\ No newline at end of file
diff --git a/website/source/layouts/community.erb b/website/source/layouts/community.erb
index a5ab417c3..a9dbd140b 100644
--- a/website/source/layouts/community.erb
+++ b/website/source/layouts/community.erb
@@ -8,7 +8,7 @@
>
Community Tools
- >
+ >
Community Maintained Plugins
diff --git a/website/source/layouts/docs.erb b/website/source/layouts/docs.erb
index 878c6653a..cbce9c085 100644
--- a/website/source/layouts/docs.erb
+++ b/website/source/layouts/docs.erb
@@ -252,6 +252,9 @@
>
Custom
+ >
+ Community-Supported
+
>
@@ -308,6 +311,9 @@
>
Custom
+ >
+ Community-Supported
+
>
diff --git a/website/source/partials/builders/_community_builders.html.md b/website/source/partials/builders/_community_builders.html.md
new file mode 100644
index 000000000..be856af18
--- /dev/null
+++ b/website/source/partials/builders/_community_builders.html.md
@@ -0,0 +1,11 @@
+### Community Builders
+
+- [ARM builder](https://github.com/solo-io/packer-builder-arm-image) - A builder
+ for creating ARM images
+
+- [vSphere builder](https://github.com/jetbrains-infra/packer-builder-vsphere) -
+ A builder for interacting directly with the vSphere API rather than the esx
+ host directly.
+
+- [Vultr builder](https://github.com/vultr/packer-builder-vultr) - A builder
+ for creating [Vultr](https://www.vultr.com/) snapshots.
\ No newline at end of file
diff --git a/website/source/partials/provisioners/_community_provisioners.html.md b/website/source/partials/provisioners/_community_provisioners.html.md
new file mode 100644
index 000000000..e0cb7c84d
--- /dev/null
+++ b/website/source/partials/provisioners/_community_provisioners.html.md
@@ -0,0 +1,9 @@
+### Community Provisioners
+
+- [Comment Provisioner](https://github.com/SwampDragons/packer-provisioner-comment) -
+ Example provisioner that allows you to annotate your build with bubble-text
+ comments.
+
+- [Windows Update provisioner](https://github.com/rgl/packer-provisioner-windows-update) -
+ A provisioner for gracefully handling windows updates and the reboots they
+ cause.
\ No newline at end of file