diff --git a/docs/index.rst b/docs/index.rst
index ff2cd24..eaac652 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -321,8 +321,8 @@ CSV
 
 ::
 
-    xml_schema,org_name,org_email,org_extra_contact_info,report_id,begin_date,end_date,errors,domain,adkim,aspf,p,sp,pct,fo,source_ip_address,source_country,source_reverse_dns,source_base_domain,count,disposition,dkim_alignment,spf_alignment,policy_override_reasons,policy_override_comments,envelope_from,header_from,envelope_to,dkim_domains,dkim_selectors,dkim_results,spf_domains,spf_scopes,spf_results
-    draft,acme.com,noreply-dmarc-support@acme.com,http://acme.com/dmarc/support,9391651994964116463,2012-04-27 20:00:00,2012-04-28 19:59:59,,example.com,r,r,none,none,100,0,72.150.241.94,US,adsl-72-150-241-94.shv.bellsouth.net,bellsouth.net,2,none,fail,pass,,,example.com,example.com,,example.com,none,fail,example.com,mfrom,pass
+    xml_schema,org_name,org_email,org_extra_contact_info,report_id,begin_date,end_date,errors,domain,adkim,aspf,p,sp,pct,fo,source_ip_address,source_country,source_reverse_dns,source_base_domain,count,spf_aligned,dkim_aligned,dmarc_aligned,disposition,policy_override_reasons,policy_override_comments,envelope_from,header_from,envelope_to,dkim_domains,dkim_selectors,dkim_results,spf_domains,spf_scopes,spf_results
+    draft,acme.com,noreply-dmarc-support@acme.com,http://acme.com/dmarc/support,9391651994964116463,2012-04-27 20:00:00,2012-04-28 19:59:59,,example.com,r,r,none,none,100,0,72.150.241.94,US,adsl-72-150-241-94.shv.bellsouth.net,bellsouth.net,2,True,False,True,none,,,example.com,example.com,,example.com,none,fail,example.com,mfrom,pass
 
 Sample forensic report output
 =============================
diff --git a/parsedmarc/__init__.py b/parsedmarc/__init__.py
index 5379711..cccfdb5 100644
--- a/parsedmarc/__init__.py
+++ b/parsedmarc/__init__.py
@@ -454,9 +454,10 @@ def parsed_aggregate_reports_to_csv_rows(reports):
             row["source_reverse_dns"] = record["source"]["reverse_dns"]
             row["source_base_domain"] = record["source"]["base_domain"]
             row["count"] = record["count"]
+            row["spf_aligned"] = record["alignment"]["spf"]
+            row["dkim_aligned"] = record["alignment"]["dkim"]
+            row["dmarc_aligned"] = record["alignment"]["dmarc"]
             row["disposition"] = record["policy_evaluated"]["disposition"]
-            row["spf_alignment"] = record["policy_evaluated"]["spf"]
-            row["dkim_alignment"] = record["policy_evaluated"]["dkim"]
             policy_override_reasons = list(map(
                 lambda r: r["type"],
                 record["policy_evaluated"]
@@ -515,8 +516,8 @@ def parsed_aggregate_reports_to_csv(reports):
               "org_extra_contact_info", "report_id", "begin_date", "end_date",
               "errors", "domain", "adkim", "aspf", "p", "sp", "pct", "fo",
               "source_ip_address", "source_country", "source_reverse_dns",
-              "source_base_domain", "count", "disposition", "dkim_alignment",
-              "spf_alignment", "policy_override_reasons",
+              "source_base_domain", "count", "spf_aligned",
+              "dkim_aligned", "dmarc_aligned", "disposition", "policy_override_reasons",
               "policy_override_comments", "envelope_from", "header_from",
               "envelope_to", "dkim_domains", "dkim_selectors", "dkim_results",
               "spf_domains", "spf_scopes", "spf_results"]