diff --git a/lang/de/lang.php b/lang/de/lang.php
index 7abd79a..9289c86 100644
--- a/lang/de/lang.php
+++ b/lang/de/lang.php
@@ -14,3 +14,5 @@ $lang['error_nomatch'] = 'Keine Treffer';
 $lang['error_outsidejail'] = 'Zugriff verweigert';
 $lang['preview'] = 'Vorschau';
 $lang['filetype'] = 'Dateityp';
+$lang['createdby'] = 'Erstellt von';
+$lang['creatorunknown'] = 'Unbekannt';
diff --git a/lang/en/lang.php b/lang/en/lang.php
index 1f7afdc..9c6a4e2 100644
--- a/lang/en/lang.php
+++ b/lang/en/lang.php
@@ -14,3 +14,5 @@ $lang['error_nomatch'] = 'No match';
 $lang['error_outsidejail'] = 'Access denied';
 $lang['preview'] = 'Preview';
 $lang['filetype'] = 'Filetype';
+$lang['createdby'] = 'Created by';
+$lang['creatorunknown'] = 'Unknown';
diff --git a/syntax.php b/syntax.php
index be96355..40a4ef4 100644
--- a/syntax.php
+++ b/syntax.php
@@ -88,6 +88,7 @@ class syntax_plugin_filelist extends DokuWiki_Syntax_Plugin {
             'link' => 2,
             'showsize' => 0,
             'showdate' => 0,
+            'showcreator' => 0,
             'listsep' => '", "',
             'onhover' => 0,
             'ftp' => 0,
@@ -340,6 +341,11 @@ class syntax_plugin_filelist extends DokuWiki_Syntax_Plugin {
                     $renderer->cdata($params['listsep'].strftime($conf['dformat'], $file['mtime']));
                 }
 
+                // render lastmodified
+                if ($params['showcreator']) {
+                    $renderer->cdata($params['listsep'].$file['creator']);
+                }
+
                 // close list item
                 if ($this->is_odt_export) {
                     $renderer->p_close();
@@ -380,6 +386,9 @@ class syntax_plugin_filelist extends DokuWiki_Syntax_Plugin {
             if ($params['tableshowdate'] || $params['showdate']) {
                 $columns++;
             }
+            if ($params['showcreator']) {
+                $columns++;
+            }
             if ($params['preview']) {
                 $columns++;
             }
@@ -407,6 +416,12 @@ class syntax_plugin_filelist extends DokuWiki_Syntax_Plugin {
                 $renderer->tableheader_close();
             }
 
+            if ($params['showcreator']) {
+                $renderer->tableheader_open();
+                $renderer->cdata($this->getLang('createdby'));
+                $renderer->tableheader_close();
+            }
+
             if ($params['preview']) {
                 $renderer->tableheader_open(1, 'center', 1);
                 switch ($params['preview']) {
@@ -446,6 +461,12 @@ class syntax_plugin_filelist extends DokuWiki_Syntax_Plugin {
                 $renderer->tablecell_close();
             }
 
+            if ($params['showcreator']) {
+                $renderer->tablecell_open();
+                $renderer->cdata($file['creator']);
+                $renderer->tablecell_close();
+            }
+
             if ($params['preview']) {
                 $renderer->tablecell_open(1, 'center', 1);
 
@@ -817,7 +838,22 @@ class syntax_plugin_filelist extends DokuWiki_Syntax_Plugin {
                     }
 
                     // prepare entry
+                    $creator = '';
                     if (!is_dir($filepath) || $params['recursive']) {
+                        if (!$params['direct']) {
+                            $medialog = new MediaChangeLog($mid);
+                            $revinfo = $medialog->getRevisionInfo(@filemtime(fullpath(mediaFN($mid))));
+
+                            if($revinfo['user']) {
+                                $creator = $revinfo['user'];
+                            } else {
+                                $creator = $revinfo['ip'];
+                            }
+                        }
+                        if (empty($creator)) {
+                            $creator = $this->getLang('creatorunknown');
+                        }
+
                         $entry = array(
                             'name' => $filename,
                             'path' => $filepath,
@@ -826,6 +862,7 @@ class syntax_plugin_filelist extends DokuWiki_Syntax_Plugin {
                             'size' => filesize($filepath),
                             'children' => ((is_dir($filepath) && $params['recursive']) ? $this->_crawl_files($filepath . '/' . $match, $params) : false),
                             'treesize' => 0,
+                            'creator' => $creator,
                         );
 
                         // calculate tree size