diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
index dd1daefa2c6..a173e9fdc33 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
@@ -180,7 +180,7 @@ public enum DisplayMode {
     private Long ownerId;
     private Long versionId;
     private int selectedTabIndex;
-    private List<DataFile> newFiles = new ArrayList();
+    private List<DataFile> newFiles = new ArrayList<>();
     private DatasetVersion workingVersion;
     private int releaseRadio = 1;
     private int deaccessionRadio = 0;
@@ -192,7 +192,7 @@ public enum DisplayMode {
     private String displayCitation;
     private String deaccessionForwardURLFor = "";
     private String showVersionList = "false";
-    private List<Template> dataverseTemplates = new ArrayList();
+    private List<Template> dataverseTemplates = new ArrayList<>();
     private Template defaultTemplate;
     private Template selectedTemplate;
     private String globalId;
@@ -208,14 +208,14 @@ public enum DisplayMode {
     
     private boolean stateChanged = false;
 
-    private List<Dataverse> dataversesForLinking = new ArrayList();
+    private List<Dataverse> dataversesForLinking = new ArrayList<>();
     private Long linkingDataverseId;
     private List<SelectItem> linkingDVSelectItems;
     private Dataverse linkingDataverse;
     
     // Version tab lists
-    private List<DatasetVersion> versionTabList = new ArrayList();
-    private List<DatasetVersion> versionTabListForPostLoad = new ArrayList();
+    private List<DatasetVersion> versionTabList = new ArrayList<>();
+    private List<DatasetVersion> versionTabListForPostLoad = new ArrayList<>();
 
     
     // Used to store results of permissions checks
@@ -496,8 +496,8 @@ public void updateReleasedVersions(){
     }
     
     public void updateLinkableDataverses() {
-        dataversesForLinking = new ArrayList();
-        linkingDVSelectItems = new ArrayList();
+        dataversesForLinking = new ArrayList<>();
+        linkingDVSelectItems = new ArrayList<>();
         
         //Since this is a super user we are getting all dataverses
         dataversesForLinking = dataverseService.findAll();
@@ -968,7 +968,7 @@ private void updateDatasetFieldInputLevels() {
             Retrieve List of DataverseFieldTypeInputLevel objects
             Use the DatasetFieldType id's which are the Map's keys
          --------------------------------------------------------- */
-        List<Long> idList = new ArrayList<Long>(mapDatasetFields.keySet());
+        List<Long> idList = new ArrayList<>(mapDatasetFields.keySet());
         List<DataverseFieldTypeInputLevel> dsFieldTypeInputLevels = dataverseFieldTypeInputLevelService.findByDataverseIdAndDatasetFieldTypeIdList(dvIdForInputLevel, idList);
         
         /* ---------------------------------------------------------
@@ -1398,7 +1398,7 @@ private void refreshSelectedFiles(){
         workingVersion = dataset.getEditVersion();
         workingVersion.getTermsOfUseAndAccess().setTermsOfAccess(termsOfAccess);
         workingVersion.getTermsOfUseAndAccess().setFileAccessRequest(requestAccess);
-        List <FileMetadata> newSelectedFiles = new ArrayList();
+        List <FileMetadata> newSelectedFiles = new ArrayList<>();
         for (FileMetadata fmd : selectedFiles){
             for (FileMetadata fmdn: workingVersion.getFileMetadatas()){
                 if (fmd.getDataFile().equals(fmdn.getDataFile())){
@@ -1465,8 +1465,8 @@ public void tabChanged(TabChangeEvent event) {
             setVersionTabList(resetVersionTabList());
             setReleasedVersionTabList(resetReleasedVersionTabList());
         } else {
-            releasedVersionTabList = new ArrayList();
-            versionTabList = new ArrayList();
+            releasedVersionTabList = new ArrayList<>();
+            versionTabList = new ArrayList<>();
             if(this.activeTabIndex == 0) {
                  init();
             }          
@@ -1921,7 +1921,7 @@ public void setSelectAllFiles(boolean selectAllFiles) {
     
     public void toggleSelectedFiles(){
         //method for when user clicks (de-)select all files
-        this.selectedFiles = new ArrayList();
+        this.selectedFiles = new ArrayList<>();
         if(this.selectAllFiles){
             for (FileMetadata fmd : workingVersion.getFileMetadatas()) {
                 this.selectedFiles.add(fmd);
@@ -1994,8 +1994,8 @@ public String getDownloadableFilesIdsString() {
     }
     
     public void updateFileCounts(){
-        setSelectedUnrestrictedFiles(new ArrayList<FileMetadata>());
-        setSelectedRestrictedFiles(new ArrayList<FileMetadata>());
+        setSelectedUnrestrictedFiles(new ArrayList<>());
+        setSelectedRestrictedFiles(new ArrayList<>());
         setTabularDataSelected(false);
         for (FileMetadata fmd : this.selectedFiles){
             if(fmd.isRestricted()){
@@ -2150,7 +2150,7 @@ public void restrictFiles(boolean restricted) {
         // line is not going to work on a new file... so be mindful of all this
         // when the code between the 2 beans is merged in 4.3.
         if (editMode != EditMode.CREATE) {
-            previouslyRestrictedFiles = new ArrayList();
+            previouslyRestrictedFiles = new ArrayList<>();
             for (FileMetadata fmd : workingVersion.getFileMetadatas()) {
                 if (fmd.isRestricted()) {
                     previouslyRestrictedFiles.add(fmd);
@@ -2203,7 +2203,7 @@ public int getRestrictedFileCount() {
         return restrictedFileCount;
     }
 
-    private List<FileMetadata> filesToBeDeleted = new ArrayList();
+    private List<FileMetadata> filesToBeDeleted = new ArrayList<>();
     
     public String  deleteFilesAndSave(){
         if (bulkUpdateCheckVersion()){
@@ -2569,7 +2569,7 @@ public void setVersionTabList(List<DatasetVersion> versionTabList) {
         this.versionTabList = versionTabList;
     }
 
-    private List<DatasetVersion> releasedVersionTabList = new ArrayList();
+    private List<DatasetVersion> releasedVersionTabList = new ArrayList<>();
 
     public List<DatasetVersion> getReleasedVersionTabList() {
         return releasedVersionTabList;
@@ -2676,7 +2676,7 @@ public void updateVersionDifferences(DatasetVersion newVersion, DatasetVersion o
 
     private List<DatasetVersion> resetVersionTabList() {
         //if (true)return null;
-        List<DatasetVersion> retList = new ArrayList();
+        List<DatasetVersion> retList = new ArrayList<>();
 
         if (permissionService.on(dataset).has(Permission.ViewUnpublishedDataset)) {
             for (DatasetVersion version : dataset.getVersions()) {
@@ -2756,7 +2756,7 @@ public String getTabularDataFileURL(Long fileid) {
     }
 
     public List< String[]> getExporters(){
-        List<String[]> retList = new ArrayList();
+        List<String[]> retList = new ArrayList<>();
         String myHostURL = getDataverseSiteUrl();
         for (String [] provider : ExportService.getInstance(settingsService).getExportersLabels() ){
             String formatName = provider[1];
@@ -2934,7 +2934,7 @@ public void clearFileMetadataSelectedForTagsPopup() {
     }
     
     public List <FileMetadata> getListFileMetadataSelectedForTagsPopup(){
-        List<FileMetadata> retList = new ArrayList();
+        List<FileMetadata> retList = new ArrayList<>();
         for (FileMetadata fm : selectedFiles){
             retList.add(fm);
         }
@@ -3135,14 +3135,14 @@ public String saveFileTagsAndCategories() {
             if (selectedFiles != null && selectedFiles.size() > 0) {
                 for (FileMetadata fm : selectedFiles) {
                     if (fm.getDataFile().equals(fmd.getDataFile())) {
-                        fmd.setCategories(new ArrayList());
+                        fmd.setCategories(new ArrayList<>());
                         if (newCategoryName != null) {
                             fmd.addCategoryByName(newCategoryName);
                         }
                         // 2. Tabular DataFile Tags: 
                         if (selectedTags != null) {
-                            for (int i = 0; i < selectedTags.length; i++) {
-                                fmd.addCategoryByName(selectedTags[i]);
+                            for (String selectedTag : selectedTags) {
+                                fmd.addCategoryByName(selectedTag);
                             }
                         }
                         if (fmd.getDataFile().isTabularData()) {
@@ -3199,7 +3199,7 @@ private void removeUnusedFileTagsFromDataset() {
                 }
             }
         }
-        List<DataFileCategory> datasetFileCategoriesToRemove = new ArrayList();
+        List<DataFileCategory> datasetFileCategoriesToRemove = new ArrayList<>();
 
         for (DataFileCategory test : dataset.getCategories()) {
             boolean remove = true;
@@ -3681,6 +3681,72 @@ public TwoRavensHelper getTwoRavensHelper() {
     public void setTwoRavensHelper(TwoRavensHelper twoRavensHelper) {
         this.twoRavensHelper = twoRavensHelper;
     }
+
+    /**
+     * dataset title
+     * @return title of workingVersion
+     */
+    public String getTitle() {
+        assert (null != workingVersion);
+        return workingVersion.getTitle();
+    }
+
+    /**
+     * dataset description
+     *
+     * @return title of workingVersion
+     */
+    public String getDescription() {
+        assert (null != workingVersion);
+        return workingVersion.getDescription();
+    }
+
+    /**
+     * dataset publication date unpublished datasets will return an empty
+     * string.
+     *
+     * @return String dataset publication date (dd MMM yyyy).
+     */
+    public String getPublicationDate() {
+        assert (null != workingVersion);
+        if (DatasetVersion.VersionState.DRAFT == workingVersion.getVersionState()) {
+            return "";
+        }
+        Date rel_date = workingVersion.getReleaseTime();
+        SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd");
+        String r = fmt.format(rel_date.getTime());
+        return r;
+    }
+
+    /**
+     * dataset authors
+     *
+     * @return list of author names
+     */
+    public List<String> getDatasetAuthors() {
+        assert (workingVersion != null);
+        return workingVersion.getDatasetAuthorNames();
+    }
+
+    /**
+     * dataset subjects
+     *
+     * @return array of String containing the subjects for a page
+     */
+    public List<String> getDatasetSubjects() {
+        assert (null != workingVersion);
+        return workingVersion.getDatasetSubjects();
+    }
+
+    /**
+     * publisher (aka - name of root dataverse)
+     *
+     * @return the publisher of the version
+     */
+    public String getPublisher() {
+        assert (null != workingVersion);
+        return workingVersion.getRootDataverseNameforCitation();
+    }
     
     /*
     public String getThumbnail() {
diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetVersion.java b/src/main/java/edu/harvard/iq/dataverse/DatasetVersion.java
index 90c827b6104..55836c576db 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DatasetVersion.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DatasetVersion.java
@@ -145,7 +145,7 @@ public void setVersion(Long version) {
 
     @OneToMany(mappedBy = "datasetVersion", cascade = {CascadeType.REMOVE, CascadeType.MERGE, CascadeType.PERSIST})
     @OrderBy("label") // this is not our preferred ordering, which is with the AlphaNumericComparator, but does allow the files to be grouped by category
-    private List<FileMetadata> fileMetadatas = new ArrayList();
+    private List<FileMetadata> fileMetadatas = new ArrayList<>();
 
     public List<FileMetadata> getFileMetadatas() {
         return fileMetadatas;
@@ -175,7 +175,7 @@ public void setTermsOfUseAndAccess(TermsOfUseAndAccess termsOfUseAndAccess) {
 
     @OneToMany(mappedBy = "datasetVersion", orphanRemoval = true, cascade = {CascadeType.REMOVE, CascadeType.MERGE, CascadeType.PERSIST})
     //@OrderBy("datasetField.displayOrder") 
-    private List<DatasetField> datasetFields = new ArrayList();
+    private List<DatasetField> datasetFields = new ArrayList<>();
 
     public List<DatasetField> getDatasetFields() {
         return datasetFields;
@@ -223,6 +223,7 @@ public void setInReview(boolean inReview){
 
     /**
      * The only time a dataset can be in review is when it is in draft.
+     * @return if the dataset is being reviewed
      */
     public boolean isInReview() {
         if (versionState != null && versionState.equals(VersionState.DRAFT)) {
@@ -485,8 +486,8 @@ public boolean isMinorUpdate() {
             if (this.getFileMetadatas().size() != this.getDataset().getReleasedVersion().getFileMetadatas().size()){
                 return false;
             } else {
-                List <DataFile> current = new ArrayList();
-                List <DataFile> previous = new ArrayList();
+                List <DataFile> current = new ArrayList<>();
+                List <DataFile> previous = new ArrayList<>();
                 for (FileMetadata fmdc : this.getFileMetadatas()){
                     current.add(fmdc.getDataFile());
                 }
@@ -522,7 +523,7 @@ public void updateDefaultValuesFromTemplate(Template template) {
     public void initDefaultValues() {
         //first clear then initialize - in case values were present 
         // from template or user entry
-        this.setDatasetFields(new ArrayList());
+        this.setDatasetFields(new ArrayList<>());
         this.setDatasetFields(this.initDatasetFields());
         TermsOfUseAndAccess terms = new TermsOfUseAndAccess();
         terms.setDatasetVersion(this);
@@ -611,6 +612,10 @@ public String getProductionDate() {
         return "Production Date";
     }
     
+    /**
+     * datasetVersion Description
+     * @return a string with the description of the dataset
+     */
     public String getDescription() {
         for (DatasetField dsf : this.getDatasetFields()) {
             if (dsf.getDatasetFieldType().getName().equals(DatasetFieldConstant.description)) {
@@ -690,7 +695,7 @@ public List<String[]> getDatasetProducers(){
     }
 
     public List<DatasetAuthor> getDatasetAuthors() {
-        //todo get "List of Authors" from datasetfieldvalue table
+        //TODO get "List of Authors" from datasetfieldvalue table
         List <DatasetAuthor> retList = new ArrayList<>();
         for (DatasetField dsf : this.getDatasetFields()) {
             Boolean addAuthor = true;
@@ -723,6 +728,30 @@ public List<DatasetAuthor> getDatasetAuthors() {
         return retList;
     }
     
+    /**
+     * @return List of Strings containing the names of the authors.
+     */
+    public List<String> getDatasetAuthorNames() {
+        List<String> authors = new ArrayList<>();
+        for (DatasetAuthor author : this.getDatasetAuthors()) {
+            authors.add(author.getName().getValue());
+        }
+        return authors;
+    }
+
+    /**
+     * @return List of Strings containing the dataset's subjects
+     */
+    public List<String> getDatasetSubjects() {
+        List<String> subjects = new ArrayList<>();
+        for (DatasetField dsf : this.getDatasetFields()) {
+            if (dsf.getDatasetFieldType().getName().equals(DatasetFieldConstant.subject)) {
+                subjects.addAll(dsf.getValues());
+            }
+        }
+        return subjects;
+    }
+
     public String getDatasetProducersString(){
         String retVal = "";
         for (DatasetField dsf : this.getDatasetFields()) {
@@ -744,7 +773,7 @@ public String getDatasetProducersString(){
     }
 
     public void setDatasetAuthors(List<DatasetAuthor> authors) {
-        // FIXME add the authores to the relevant fields
+        // FIXME add the authors to the relevant fields
     }
 
     public String getCitation() {
@@ -768,6 +797,10 @@ public Date getCitationDate() {
         return null;
     }
     
+    /**
+     * @param dsfType The type of DatasetField required
+     * @return the first field of type dsfType encountered.
+     */
     public DatasetField getDatasetField(DatasetFieldType dsfType) {
         if (dsfType != null) {
             for (DatasetField dsf : this.getFlatDatasetFields()) {
@@ -777,7 +810,6 @@ public DatasetField getDatasetField(DatasetFieldType dsfType) {
             }
         }
         return null;
-
     }
 
     public String getDistributionDate() {
@@ -817,7 +849,7 @@ public String getRootDataverseNameforCitation(){
 
     public List<DatasetDistributor> getDatasetDistributors() {
         //todo get distributors from DatasetfieldValues
-        return new ArrayList();
+        return new ArrayList<>();
     }
 
     public void setDatasetDistributors(List<DatasetDistributor> distributors) {
@@ -887,7 +919,7 @@ private DatasetField initDatasetField(DatasetField dsf) {
 
     public List<DatasetField> initDatasetFields() {
         //retList - Return List of values
-        List<DatasetField> retList = new ArrayList();
+        List<DatasetField> retList = new ArrayList<>();
         //Running into null on create new dataset
         if (this.getDatasetFields() != null) {
             for (DatasetField dsf : this.getDatasetFields()) {
@@ -969,7 +1001,7 @@ public String getReturnToFilePageURL (String serverName, Dataset dset, DataFile
     }
     
     public List<DatasetField> copyDatasetFields(List<DatasetField> copyFromList) {
-        List<DatasetField> retList = new ArrayList();
+        List<DatasetField> retList = new ArrayList<>();
 
         for (DatasetField sourceDsf : copyFromList) {
             //the copy needs to have the current version
@@ -985,7 +1017,7 @@ public List<DatasetField> getFlatDatasetFields() {
     }
 
     private List<DatasetField> getFlatDatasetFields(List<DatasetField> dsfList) {
-        List<DatasetField> retList = new LinkedList();
+        List<DatasetField> retList = new LinkedList<>();
         for (DatasetField dsf : dsfList) {
             retList.add(dsf);
             if (dsf.getDatasetFieldType().isCompound()) {
@@ -1023,7 +1055,7 @@ public String getSemanticVersion() {
     }
 
     public List<ConstraintViolation> validateRequired() {
-        List<ConstraintViolation> returnListreturnList = new ArrayList();
+        List<ConstraintViolation> returnListreturnList = new ArrayList<>();
         ValidatorFactory factory = Validation.buildDefaultValidatorFactory();
         Validator validator = factory.getValidator();
         for (DatasetField dsf : this.getFlatDatasetFields()) {
@@ -1040,7 +1072,7 @@ public List<ConstraintViolation> validateRequired() {
     }
     
     public Set<ConstraintViolation> validate() {
-        Set<ConstraintViolation> returnSet = new HashSet();
+        Set<ConstraintViolation> returnSet = new HashSet<>();
 
         ValidatorFactory factory = Validation.buildDefaultValidatorFactory();
         Validator validator = factory.getValidator();
diff --git a/src/main/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml
index 6113ab87a49..845fcb3d5ae 100755
--- a/src/main/webapp/dataset.xhtml
+++ b/src/main/webapp/dataset.xhtml
@@ -19,7 +19,21 @@
             <ui:param name="dataset" value="#{DatasetPage.dataset}"/>
             <ui:param name="version" value="#{DatasetPage.workingVersion}"/>
             <ui:param name="locked" value="#{DatasetPage.locked}"/>
-            <ui:param name="showMessagePanel" value="#{true}"/>
+	    <ui:param name="showMessagePanel" value="#{true}"/>
+	    <ui:define name="dc_meta_header">
+	    <meta name="DC.identifier" content="#{DatasetPage.persistentId}"/>
+	    <meta name="DC.type" content="Dataset"/>
+	    <meta name="DC.title" content="#{DatasetPage.title}"/>
+	    <meta name="DC.date" content="#{DatasetPage.publicationDate}"/>
+	    <meta name="DC.publisher" content="#{DatasetPage.publisher}" />
+            <meta name="DC.description" content="#{DatasetPage.description}" />
+	    <ui:repeat var="author" value="#{DatasetPage.datasetAuthors}">
+            <meta name="DC.creator" content="#{author}"/>
+	    </ui:repeat>
+            <ui:repeat var="subject" value="#{DatasetPage.datasetSubjects}">
+            <meta name="DC.subject" content="#{subject}"/>
+	    </ui:repeat>
+	    </ui:define>
             <ui:define name="body">
                 <o:importFunctions type="edu.harvard.iq.dataverse.util.MarkupChecker" />
                 <f:metadata>
diff --git a/src/main/webapp/dataverse_template.xhtml b/src/main/webapp/dataverse_template.xhtml
index f508be1d599..fc7b8b09948 100644
--- a/src/main/webapp/dataverse_template.xhtml
+++ b/src/main/webapp/dataverse_template.xhtml
@@ -11,7 +11,8 @@
     <h:head>
         <f:facet name="first">
             <title><h:outputText value="#{pageTitle}"/></title>
-            <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+	    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+	    <ui:insert name="dc_meta_header"></ui:insert>
             <meta http-equiv="Content-Language" content="en"/>
             <meta name="viewport" content="width=device-width, initial-scale=1"/>
             <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
diff --git a/src/test/java/edu/harvard/iq/dataverse/DatasetVersionTest.java b/src/test/java/edu/harvard/iq/dataverse/DatasetVersionTest.java
index e00bb21fbef..c0e665726f3 100644
--- a/src/test/java/edu/harvard/iq/dataverse/DatasetVersionTest.java
+++ b/src/test/java/edu/harvard/iq/dataverse/DatasetVersionTest.java
@@ -6,6 +6,7 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import java.util.logging.Logger;
 import org.junit.After;
 import org.junit.AfterClass;
 import static org.junit.Assert.assertEquals;
@@ -18,7 +19,7 @@
  * @author michael
  */
 public class DatasetVersionTest {
-    
+
     public DatasetVersionTest() {
     }