Index: class_image.inc
===================================================================
--- class_image.inc	(revision 427)
+++ class_image.inc	(working copy)
@@ -72,18 +72,52 @@
         );
 }
 
+function _acidfree_array_like($match, $arr) {
+    foreach ($arr as $v) {
+        if (similar_text($v, $match) > (strlen($match) * 0.75))
+            return true;
+    }
+    return false;
+}
+
 function theme_acidfree_exif_data(&$node) {
-    $output = '<div id="acidfree-exif-data"><h3>'.t('EXIF data:').'</h3>';
+    $props = variable_get('acidfree_exif_properties', EXIF_DEFAULT_PROPERTIES);
+    $props = explode(',', $props);
+    $output = '<div id="acidfree-exif">';
     $largefile = file_create_path($node->images['_original']);
     if ($largefile && file_exists($largefile)) {
-        $exif = exif_read_data($largefile, 0, true);
-        foreach ($exif as $key => $section) {
-            foreach ($section as $name => $val) {
-                $output .= "$key.$name: $val<br />\n";
+        if (function_exists('exif_read_data')) {
+            $exif = exif_read_data($largefile, 0, true);
+            if ($exif) {
+                foreach ($exif as $section) {
+                    foreach ($section as $key => $val) {
+                        if (_acidfree_array_like($key, $props)) {
+                            $rows[] = array(
+                                array(
+                                    'data' => $key,
+                                    'class' => 'acidfree-exif-title',
+                                    ),
+                                array(
+                                    'data' => $val,
+                                    'class' => 'acidfree-exif-value',
+                                    ),
+                                );
+                        }
+                    }
+                }
+                $header = array(
+                        array(
+                                'data' => t('Exif Property'),
+                                'class' => 'acidfree-exif-title',
+                            ),
+                        array(
+                                'data' => t('Value'),
+                                'class' => 'acidfree-exif-value',
+                            )
+                    );
+                $output .= theme('table', $header, $rows);
             }
         }
-    } else {
-        $output .= t('no exif data');
     }
     $output .= '</div>';
     return $output;
Index: acidfree.module
===================================================================
--- acidfree.module	(revision 429)
+++ acidfree.module	(working copy)
@@ -55,6 +55,9 @@
 define('ALBUM_PAGER', 0);
 define('ELEMENT_PAGER', 1);
 define('PAGER_STRING', "page");
+define('EXIF_DEFAULT_PROPERTIES', 'Make,Model,ApertureValue,ColorSpace,'.
+        'ExposureBiasValue,ExposureProgram,Flash,FocalLength,ISO,MeteringMode,'.
+        'ShutterSpeedValue,DateTime,IPTC/Caption,IPTC/CopyrightNotice');
 
 /**
  * Acidfree Classes
@@ -622,6 +625,13 @@
             '#title' => t('Show EXIF data in full image view'),
             '#default_value' => variable_get('acidfree_show_exif_data', false),
         );
+    $form['display']['acidfree_exif_properties'] = array(
+            '#type' => 'textfield',
+            '#title' => t('Exif properties'),
+            '#maxlength' => 500,
+            '#default_value' => variable_get('acidfree_exif_properties', EXIF_DEFAULT_PROPERTIES),
+            '#description' => t('Enter a list of Exif properties to be displayed seperated by commas.')
+        );
     $form['display']['acidfree_filter_caption'] = array(
             '#type' => 'checkbox',
             '#title' => t('Show image title as default caption for inline images'),
Index: acidfree.css
===================================================================
--- acidfree.css	(revision 427)
+++ acidfree.css	(working copy)
@@ -140,3 +140,14 @@
 .acidfree-list-body {
   margin-left: 55px;
 }
+
+/* Styles for the exif properties */
+div#acidfree-exif table {
+  width: auto;
+  text-align: left;
+  display: inline;
+}
+
+.acidfree-exif-title {
+  padding-right: 80px;
+}