diff --git a/CHANGELOG.md b/CHANGELOG.md
index 87ea639..1e6db7f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,11 @@
 Changelog
 =========
 
+8.18.7
+------
+
+Removed improper spaces from  `base_reverse_dns_map.csv` (Closes #612)
+
 8.18.6
 ------
 
diff --git a/parsedmarc/constants.py b/parsedmarc/constants.py
index 7102a17..3501402 100644
--- a/parsedmarc/constants.py
+++ b/parsedmarc/constants.py
@@ -1,2 +1,2 @@
-__version__ = "8.18.6"
+__version__ = "8.18.7"
 USER_AGENT = f"parsedmarc/{__version__}"
diff --git a/parsedmarc/resources/maps/base_reverse_dns_map.csv b/parsedmarc/resources/maps/base_reverse_dns_map.csv
index 83f6411..7b57cb6 100644
--- a/parsedmarc/resources/maps/base_reverse_dns_map.csv
+++ b/parsedmarc/resources/maps/base_reverse_dns_map.csv
@@ -1,5 +1,5 @@
 base_reverse_dns,name,type
- ttn.gob.ar,Tribunal de Tasaciones de la Nación,Government
+ttn.gob.ar,Tribunal de Tasaciones de la Nación,Government
 1000island.net,1000 Island,ISP
 101-clientes-izzi.mx,Izzi Telecom,ISP
 118-clientes-izzi.mx,Izzi Telecom,ISP
@@ -675,7 +675,7 @@ idodns.com,IDO DNS,MSP
 ifeelfree.co.nz,I Feel Free,MSP
 iftnet.com.br,IFTNET Telecom,ISP
 iglou.com,IgLou Internet Services,ISP
-iij4u.or.jp, Internet Initiative Japan,ISP
+iij4u.or.jp,Internet Initiative Japan,ISP
 ik2.com,Spamflare,Email Security
 ilap.com,ILAP,ISP
 imanila.ph,iManila,Marketing
@@ -777,7 +777,7 @@ keymail.com,KeyMail,Email Provider
 kforce.com,Kforce,Staffing
 kilmarnock.ca,Kilmarnock Enterprise,Industrial
 kindlebio.com,Kindle Bioscinces,Healthcare
-king-good.com, Jinku Group,Industrial
+king-good.com,Jinku Group,Industrial
 kingswoodfacadesthailand.com,Kingswood Facades Thailand,Industrial
 kirkbrothers.com,Kirk Brothers Supercenter,Automotive
 kitano-hp.or.jp,Kitano Hospital,Healthcare
@@ -795,7 +795,7 @@ kpu-m.ac.jp,Kyoto Prefectural University of Medicine,Education
 kreativemachinez.tech,Kreative Machinez,Marketing
 kryptronic.com,Kryptronic,SaaS
 ktc.kz,KTC Kazakhstan LLP,Industrial
-ktis.net, Kingdom Networks,ISP
+ktis.net,Kingdom Networks,ISP
 ktk-sol.co.jp,KtK Solutions,Email Security
 kundenserver.de,domainfactory GmbH,Web Host
 kyoto-u.ac.jp,Kyoto University,Education