diff --git a/etc/eyefiserver.conf b/etc/eyefiserver.conf
index 23107e0..288d384 100644
--- a/etc/eyefiserver.conf
+++ b/etc/eyefiserver.conf
@@ -34,6 +34,10 @@ upload_dir=~/eyefi/%Y/%Y%m%d
 
 use_date_from_file=no
 
+# Should we extract EyeFi logs from image tarfile.
+# They are of little use usually, so default is 'no'.
+
+#extract_logs=yes
 
 # This parameter executes the specified command on each incoming file passing in
 # the full file path as the first argument.
diff --git a/src/eyefiserver b/src/eyefiserver
index 372b5a1..59849db 100755
--- a/src/eyefiserver
+++ b/src/eyefiserver
@@ -719,7 +719,14 @@ class EyeFiRequestHandler(BaseHTTPRequestHandler):
 
         eyeFiLogger.debug("Extracting TAR file %s", tarpath)
         imagefilename = imagetarfile.getnames()[0]
-        imagetarfile.extractall(path=upload_dir)
+
+        extract_logs = self.server.config.getboolean(macaddress,
+            'extract_logs', False)
+
+        if extract_logs:
+            imagetarfile.extractall(path=upload_dir)
+        else:
+            imagetarfile.extract(imagefilename, path=upload_dir)
 
         if use_date_from_file and correct_mtime:
             corr_mtime = time.mktime(reference_date.timetuple())