diff --git a/2018/8xxx/CVE-2018-8840.json b/2018/8xxx/CVE-2018-8840.json
index 3f793aa39f6..dfc265463a3 100644
--- a/2018/8xxx/CVE-2018-8840.json
+++ b/2018/8xxx/CVE-2018-8840.json
@@ -1,9 +1,32 @@
 {
    "CVE_data_meta" : {
-      "ASSIGNER" : "cve@mitre.org",
+      "ASSIGNER" : "ics-cert@hq.dhs.gov",
       "DATE_PUBLIC" : "2018-04-06T00:00:00",
       "ID" : "CVE-2018-8840",
-      "STATE" : "RESERVED"
+      "STATE" : "PUBLIC"
+   },
+   "affects" : {
+      "vendor" : {
+         "vendor_data" : [
+            {
+               "product" : {
+                  "product_data" : [
+                     {
+                        "product_name" : "Schneider Electric InduSoft Web Studio and InTouch Machine Edition",
+                        "version" : {
+                           "version_data" : [
+                              {
+                                 "version_value" : "InduSoft Web Studio v8.1 and prior versions, and InTouch Machine Edition 2017 v8.1 and prior versions."
+                              }
+                           ]
+                        }
+                     }
+                  ]
+               },
+               "vendor_name" : "ICS-CERT"
+            }
+         ]
+      }
    },
    "data_format" : "MITRE",
    "data_type" : "CVE",
@@ -12,7 +35,29 @@
       "description_data" : [
          {
             "lang" : "eng",
-            "value" : "** RESERVED ** This candidate has been reserved by an organization or individual that will use it when announcing a new security problem.  When the candidate has been publicized, the details for this candidate will be provided."
+            "value" : "A remote attacker could send a carefully crafted packet in InduSoft Web Studio v8.1 and prior versions, and/or InTouch Machine Edition 2017 v8.1 and prior versions during a tag, alarm, or event related action such as read and write, which may allow remote code execution."
+         }
+      ]
+   },
+   "problemtype" : {
+      "problemtype_data" : [
+         {
+            "description" : [
+               {
+                  "lang" : "eng",
+                  "value" : "STACK-BASED BUFFER OVERFLOW CWE-121"
+               }
+            ]
+         }
+      ]
+   },
+   "references" : {
+      "reference_data" : [
+         {
+            "url" : "https://ics-cert.us-cert.gov/advisories/ICSA-18-107-01"
+         },
+         {
+            "url" : "http://software.schneider-electric.com/pdf/security-bulletin/lfsec00000125/"
          }
       ]
    }