diff --git a/CHANGES.rst b/CHANGES.rst
index f91d055473..b6a25c3dfd 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -32,6 +32,8 @@ Features Added
 Restructuring
 +++++++++++++
 
+  - Made Products.MailHost an optional dependency.
+
 
 4.0a6 (2017-06-01)
 ------------------
diff --git a/buildout.cfg b/buildout.cfg
index 77d292ccbb..89ca102bd4 100644
--- a/buildout.cfg
+++ b/buildout.cfg
@@ -20,7 +20,6 @@ parts =
     requirements
 sources-dir = develop
 auto-checkout =
-    Products.MailHost
 
 
 [test]
@@ -68,8 +67,6 @@ eggs =
     five.localsitemanager
     Missing
     Products.BTreeFolder2
-# Exclude not yet ported MailHost
-#    Products.MailHost
     Products.ZCatalog
     Record
 
diff --git a/requirements-full.txt b/requirements-full.txt
index 1e510cf2db..031fb9d3bf 100644
--- a/requirements-full.txt
+++ b/requirements-full.txt
@@ -12,7 +12,7 @@ MultiMapping==4.0
 PasteDeploy==1.5.2
 Persistence==3.0a3
 Products.BTreeFolder2==4.0.0
-Products.MailHost==3.0 ; python_version < '3.0'
+Products.MailHost==3.0
 Products.ZCTextIndex==4.0.2
 Products.ZCatalog==4.0.0
 Record==3.4
diff --git a/util.py b/util.py
index 24384544fd..676bcd8ade 100644
--- a/util.py
+++ b/util.py
@@ -8,7 +8,6 @@
 HERE = os.path.abspath(os.path.dirname(__file__))
 
 PY2_ONLY = [
-    'Products.MailHost',
     'ZServer',
 ]