diff --git a/CHANGELOG.md b/CHANGELOG.md
index f5eaa31..15ca563 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,10 @@
 5.1.0
 -----
 
-- Add support for TLS/SSL and uerename/password auth to Kafka 
+- Bugfix: Elasticsearch/Python mapping mismatch (fixes root cause of issue #25)
+- Remove static `elasticsearch` and `elasticsearch-dsl` versions from package requirements
+- Add support for TLS/SSL and username/password auth to Kafka
+ 
 
 5.0.2
 -----
diff --git a/parsedmarc/elastic.py b/parsedmarc/elastic.py
index 87d8f79..937ebd6 100644
--- a/parsedmarc/elastic.py
+++ b/parsedmarc/elastic.py
@@ -30,7 +30,7 @@ class _PublishedPolicy(InnerDoc):
     p = Text()
     sp = Text()
     pct = Integer()
-    fo = Text()  # TODO: Change this to Text (issue #31)
+    fo = Text()
 
 
 class _DKIMResult(InnerDoc):
@@ -54,7 +54,7 @@ class _AggregateReportDoc(Document):
     org_email = Text()
     org_extra_contact_info = Text()
     report_id = Text()
-    date_range = DateRange()
+    date_range = Date()
     errors = Text()
     published_policy = Object(_PublishedPolicy)
     source_ip_address = Ip()
diff --git a/requirements.txt b/requirements.txt
index cb88f88..04e1e60 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,8 +9,8 @@ dnspython
 imapclient
 mail-parser
 dateparser
-elasticsearch==6.3.1
-elasticsearch-dsl==6.2.1
+elasticsearch
+elasticsearch-dsl
 kafka-python
 flake8
 sphinx
diff --git a/setup.py b/setup.py
index 1b5d3ad..95d92f8 100644
--- a/setup.py
+++ b/setup.py
@@ -95,8 +95,8 @@ setup(
     install_requires=['dnspython', 'expiringdict', 'publicsuffix',
                       'xmltodict', 'geoip2', 'urllib3<1.24,>=1.21.1',
                       'requests', 'imapclient', 'mail-parser', 'dateparser',
-                      'elasticsearch==6.3.1',
-                      'elasticsearch-dsl==6.2.1', 'kafka-python'
+                      'elasticsearch',
+                      'elasticsearch-dsl', 'kafka-python'
                       ],
 
     entry_points={