diff --git a/lib/msf/core/db_export.rb b/lib/msf/core/db_export.rb
index 61ac0b59ba..78003f8f8c 100644
--- a/lib/msf/core/db_export.rb
+++ b/lib/msf/core/db_export.rb
@@ -374,6 +374,18 @@ class Export
           report_file.write("      #{el}\n")
         end
 
+        # Notes attached to vulns instead of the host
+        report_file.write("        <notes>\n")
+        @notes.where(vuln_id: e.id).each do |note|
+          report_file.write("      <note>\n")
+          note.attributes.each_pair do |k,v|
+            el = create_xml_element(k,v)
+            report_file.write("      #{el}\n")
+          end
+          report_file.write("      </note>\n")
+        end
+        report_file.write("        </notes>\n")
+
         # References
         report_file.write("        <refs>\n")
         e.refs.each do |ref|