diff --git a/src/main/java/edu/harvard/iq/dataverse/dataset/DatasetUtil.java b/src/main/java/edu/harvard/iq/dataverse/dataset/DatasetUtil.java
index e2773b13c93..0cc6f494f6f 100644
--- a/src/main/java/edu/harvard/iq/dataverse/dataset/DatasetUtil.java
+++ b/src/main/java/edu/harvard/iq/dataverse/dataset/DatasetUtil.java
@@ -459,12 +459,16 @@ public static List<DatasetField> getDatasetSummaryFields(DatasetVersion datasetV
   }
 }
 */
+    // TODO: Make this more performant by writing the output to the database or a file?
     public static String getJsonLd(DatasetVersion workingVersion) {
+        // We show published datasets only for "datePublished" field below.
+        if (workingVersion.isDraft()) {
+            return "";
+        }
         JsonObjectBuilder job = Json.createObjectBuilder();
         job.add("@context", "http://schema.org");
         job.add("@type", "Dataset");
-        // FIXME
-        job.add("@id", "https://doi.org/10.7910/dvn/icfngt");
+        job.add("@id", workingVersion.getDataset().getPersistentURL());
         job.add("additionalType", "Dataset");
         job.add("name", workingVersion.getTitle());
         job.add("@context", "http://schema.org");
@@ -480,6 +484,7 @@ public static String getJsonLd(DatasetVersion workingVersion) {
             String firstName = null;
             String lastName = null;
             if (parts.length == 1) {
+                // TODO: consider adding "Thing" for the "@type" explicitly here.
                 name = personOrOrganization;
             } else {
                 author.add("@type", "Person");
@@ -493,18 +498,15 @@ public static String getJsonLd(DatasetVersion workingVersion) {
             authors.add(author);
         }
         job.add("author", authors);
-        // FIXME
-        job.add("datePublished", "2017");
+        job.add("datePublished", workingVersion.getProductionDate());
         job.add("schemaVersion", "http://datacite.org/schema/kernel-4");
         job.add("publisher", Json.createObjectBuilder()
                 .add("@type", "Organization")
-                // FIXME
-                .add("name", "Harvard Dataverse")
+                .add("name", workingVersion.getRootDataverseNameforCitation())
         );
         job.add("provider", Json.createObjectBuilder()
                 .add("@type", "Organization")
-                // FIXME
-                .add("name", "DataCite")
+                .add("name", "Dataverse")
         );
         return job.build().toString();
     }