diff --git a/ccm-cms/pom.xml b/ccm-cms/pom.xml
index 8a3a80d6d..e1065b78d 100644
--- a/ccm-cms/pom.xml
+++ b/ccm-cms/pom.xml
@@ -101,6 +101,10 @@
             <groupId>com.fasterxml.jackson.jaxrs</groupId>
             <artifactId>jackson-jaxrs-xml-provider</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jsr310</artifactId>
+        </dependency>
         
         <!-- Dependencies for log4j 2 -->
         <dependency>
diff --git a/ccm-core/pom.xml b/ccm-core/pom.xml
index a2a8e43b9..a11111401 100644
--- a/ccm-core/pom.xml
+++ b/ccm-core/pom.xml
@@ -266,6 +266,10 @@
             <groupId>com.fasterxml.jackson.dataformat</groupId>
             <artifactId>jackson-dataformat-csv</artifactId>
         </dependency>
+        <dependency>            <!-- For Java 8 date/time types -->
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jsr310</artifactId>
+        </dependency>
 
     </dependencies>
 
diff --git a/ccm-core/src/main/java/org/libreccm/imexport/AbstractEntityImExporter.java b/ccm-core/src/main/java/org/libreccm/imexport/AbstractEntityImExporter.java
index 9e3c14df3..0a1b6200a 100644
--- a/ccm-core/src/main/java/org/libreccm/imexport/AbstractEntityImExporter.java
+++ b/ccm-core/src/main/java/org/libreccm/imexport/AbstractEntityImExporter.java
@@ -20,6 +20,7 @@ package org.libreccm.imexport;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 
 import java.io.IOException;
 import java.util.Set;
@@ -39,7 +40,13 @@ import javax.transaction.Transactional;
  */
 public abstract class AbstractEntityImExporter<T extends Exportable> {
 
-    private final ObjectMapper objectMapper = new ObjectMapper();
+    private final ObjectMapper objectMapper;
+
+    public AbstractEntityImExporter() {
+        objectMapper = new ObjectMapper()
+            .registerModule(new JavaTimeModule());
+
+    }
 
     /**
      * Returns the Entity class which is handled by the implementation. This
@@ -112,7 +119,7 @@ public abstract class AbstractEntityImExporter<T extends Exportable> {
 
     /**
      * Reloads the entity to export. Entities become detacted for several
-     * reasons before they are passed to the null null     {@link #exportEntity(org.libreccm.imexport.Exportable) method. The 
+     * reasons before they are passed to the null null null     {@link #exportEntity(org.libreccm.imexport.Exportable) method. The 
      * implementation of this should reload the passed entity.
      *
      * @param entity The entity to reload.