diff --git a/lib/class/song.class.php b/lib/class/song.class.php
index 7cf5ff1e..f68f7f98 100644
--- a/lib/class/song.class.php
+++ b/lib/class/song.class.php
@@ -2038,6 +2038,7 @@ class Song extends database_object implements media, library_item
         $meta['time']                  = $this->time;
         $meta['mime']                  = $this->mime;
         $meta['title']                 = $this->title;
+        $meta['comment']               = $this->comment;
         $meta['album']                 = $this->f_album_full;
         $meta['artist']                = $this->f_artist_full;
         $meta['band']                  = $meta['albumartist']                  = $this->f_albumartist_full;
diff --git a/templates/show_edit_song_row.inc.php b/templates/show_edit_song_row.inc.php
index 7ab5eba7..60ccae0c 100644
--- a/templates/show_edit_song_row.inc.php
+++ b/templates/show_edit_song_row.inc.php
@@ -72,6 +72,10 @@
             <tr>
                 <td class="edit_dialog_content_header"><?php echo T_('Composer') ?></td>
                 <td><input type="text" name="composer" value="<?php echo scrub_out($libitem->composer); ?>" /></td>
+          </tr>
+            <tr>
+                <td class="edit_dialog_content_header"><?php echo T_('Comment') ?></td>
+                <td><input type="text" name="comment" value="<?php echo scrub_out($libitem->comment); ?>" /></td>
             </tr>
             <tr>
                 <td class="edit_dialog_content_header"><?php echo T_('Label') ?></td>