diff --git a/docs/release-notes/index.rst b/docs/release-notes/index.rst
index 72bedfa675..eb8e23d401 100644
--- a/docs/release-notes/index.rst
+++ b/docs/release-notes/index.rst
@@ -18,11 +18,17 @@ See :doc:`Plugin API <../index>` and
 Breaking Changes
 ----------------
 
-* `The RepositoryPublishURLSerializer was removed from the plugin API. <https://github.com/pulp/pulpcore-plugin/pull/93/>`_
-* `Publications are now Master/Detail. <https://pulp.plan.io/issues/4678>`_ Plugins that use
-  Publications will need to provide a detail Publication. Here is an example of pulp_file
-  introducing the `FilePublisher <https://github.com/pulp/pulp_file/pull/205>`_ as an example of
-  changes to match along with its `follow-on change <https://github.com/pulp/pulp_file/pull/215>`.
+`The RepositoryPublishURLSerializer was removed from the plugin API. <https://github.com/pulp/
+pulpcore-plugin/pull/93/>`_
+
+`Distributions are now Master/Detail. <https://pulp.plan.io/issues/4785>`_ All plugins will require
+updating to provide a Detail :term:`Distribution`. Here is an example of pulp_file introducing the
+`FileDistribution <https://github.com/pulp/pulp_file/pull/217>`_ as an example of changes to match.
+
+`Publications are now Master/Detail. <https://pulp.plan.io/issues/4678>`_ Plugins that use
+:term:`Publications` will need to provide a detail Publication. Here is an example of pulp_file
+introducing the `FilePublisher <https://github.com/pulp/pulp_file/pull/205>`_ as an example of
+changes to match along with its `follow-on change <https://github.com/pulp/pulp_file/pull/215>`_.
 
 0.1.0rc1
 ========
diff --git a/pulpcore/plugin/models/__init__.py b/pulpcore/plugin/models/__init__.py
index d71f0b2376..2ef01533a0 100644
--- a/pulpcore/plugin/models/__init__.py
+++ b/pulpcore/plugin/models/__init__.py
@@ -7,18 +7,19 @@
     Content,
     ContentArtifact,
     CreatedResource,
-    Distribution,
     MasterModel,
     Model,
     ProgressBar,
     ProgressSpinner,
     Publication,
+    PublicationDistribution,
     PublishedArtifact,
     PublishedMetadata,
     Repository,
     RemoteArtifact,
     RepositoryContent,
-    RepositoryVersion
+    RepositoryVersion,
+    RepositoryVersionDistribution,
 )
 
 from .content import ContentGuard  # noqa
diff --git a/pulpcore/plugin/serializers.py b/pulpcore/plugin/serializers.py
index 183f63eb41..faafd71bcc 100644
--- a/pulpcore/plugin/serializers.py
+++ b/pulpcore/plugin/serializers.py
@@ -3,7 +3,6 @@
     ArtifactSerializer,
     AsyncOperationResponseSerializer,
     BaseDistributionSerializer,
-    DistributionSerializer,
     ContentGuardSerializer,
     NoArtifactContentSerializer,
     SingleArtifactContentSerializer,
@@ -14,10 +13,12 @@
     NestedIdentityField,
     NestedRelatedField,
     RemoteSerializer,
+    PublicationDistributionSerializer,
     PublicationSerializer,
     PublisherSerializer,
     RelatedField,
     RepositorySyncURLSerializer,
+    RepositoryVersionDistributionSerializer,
     SingleContentArtifactField,
     relative_path_validator,
     validate_unknown_fields
diff --git a/pulpcore/plugin/viewsets.py b/pulpcore/plugin/viewsets.py
index f74a5186cf..2159eb6275 100644
--- a/pulpcore/plugin/viewsets.py
+++ b/pulpcore/plugin/viewsets.py
@@ -3,12 +3,12 @@
 
 # Import Viewsets in platform that are potentially useful to plugin writers
 from pulpcore.app.viewsets import (  # noqa
+    BaseDistributionViewSet,
     BaseFilterSet,
     ContentFilter,
     ContentGuardFilter,
     ContentGuardViewSet,
     ContentViewSet,
-    DistributionViewSet,
     NamedModelViewSet,
     PublicationViewSet,
     PublisherViewSet,