diff --git a/install/helioviewer/hvpull/net/daemon.py b/install/helioviewer/hvpull/net/daemon.py
index 2d4915d2..0a0e31b8 100644
--- a/install/helioviewer/hvpull/net/daemon.py
+++ b/install/helioviewer/hvpull/net/daemon.py
@@ -670,9 +670,9 @@ def send_email_alert(self, message):
 
         # import email modules
         import smtplib
-        from email.MIMEMultipart import MIMEMultipart
-        from email.MIMEText import MIMEText
-        from email.Utils import formatdate
+        from email.mime.multipart import MIMEMultipart
+        from email.mime.text import MIMEText
+        from email.utils import formatdate
 
         msg = MIMEMultipart()
         msg['From'] = self.email_from
@@ -886,6 +886,7 @@ def get_servers(cls):
             "halpha": "GongDataServer",
             "hv_rhessi": "HVRHESSIDataServer",
             "punch": "PUNCHDataServer",
+            "local": "LocalDataServer",
         }
 
     @classmethod
diff --git a/install/helioviewer/hvpull/servers/local.py b/install/helioviewer/hvpull/servers/local.py
new file mode 100644
index 00000000..d3a75aaf
--- /dev/null
+++ b/install/helioviewer/hvpull/servers/local.py
@@ -0,0 +1,41 @@
+"""Local DataServer"""
+from helioviewer.hvpull.servers import DataServer
+import datetime
+import os
+
+class LocalDataServer(DataServer):
+    def __init__(self):
+        """This assumes that local jp2 files are stored in a directory
+        specified by the LOCAL_DATA_DIR environment variable. Files are
+        expected to be organized in subdirectories that can be picked up
+        by the ingestion services. Note that a full path is required to
+        specify the location of the data."""
+        local_data_dir = os.environ.get('LOCAL_DATA_DIR')
+        if not local_data_dir:
+            raise ValueError("LOCAL_DATA_DIR environment variable is not set")
+        DataServer.__init__(self, local_data_dir, "Local")
+        self.pause = datetime.timedelta(minutes=30)
+
+    def compute_directories(self, start_date, end_date):
+        """Computes a list of remote directories expected to contain files
+        by recursively finding all folders and subfolders in LOCAL_DATA_DIR"""
+        dirs = []
+
+        # Recursively walk through all directories in LOCAL_DATA_DIR
+        for root, dirnames, filenames in os.walk(self.uri):
+            # Add each subdirectory found
+            for dirname in dirnames:
+                dirs.append(os.path.join(root, dirname))
+            # Also add the root directory itself if it's not already the base uri
+            if root != self.uri:
+                dirs.append(root)
+
+        # Add the base directory itself
+        if self.uri not in dirs:
+            dirs.append(self.uri)
+
+        return dirs
+
+    def get_starttime(self):
+        """Default start time to use when retrieving data"""
+        return datetime.datetime.utcnow()