diff --git a/src/NzbDrone.Core/IndexerSearch/NewznabResults.cs b/src/NzbDrone.Core/IndexerSearch/NewznabResults.cs
index 8e97c2806..da6d01c82 100644
--- a/src/NzbDrone.Core/IndexerSearch/NewznabResults.cs
+++ b/src/NzbDrone.Core/IndexerSearch/NewznabResults.cs
@@ -92,11 +92,15 @@ namespace NzbDrone.Core.IndexerSearch
                             GetNabElement("rageid", r.TvRageId, protocol),
                             GetNabElement("tvdbid", r.TvdbId, protocol),
                             GetNabElement("imdb", r.ImdbId.ToString("D7"), protocol),
-                            GetNabElement("tmdb", r.TmdbId, protocol),
+                            GetNabElement("tmdbid", r.TmdbId, protocol),
                             GetNabElement("seeders", t.Seeders, protocol),
                             GetNabElement("files", r.Files, protocol),
                             GetNabElement("grabs", r.Grabs, protocol),
                             GetNabElement("peers", t.Peers, protocol),
+                            GetNabElement("author", RemoveInvalidXMLChars(r.Author), protocol),
+                            GetNabElement("booktitle", RemoveInvalidXMLChars(r.BookTitle), protocol),
+                            GetNabElement("artist", RemoveInvalidXMLChars(r.Artist), protocol),
+                            GetNabElement("album", RemoveInvalidXMLChars(r.Album), protocol),
                             GetNabElement("infohash", RemoveInvalidXMLChars(t.InfoHash), protocol),
                             GetNabElement("minimumratio", t.MinimumRatio, protocol),
                             GetNabElement("minimumseedtime", t.MinimumSeedTime, protocol),
diff --git a/src/NzbDrone.Core/Indexers/Definitions/Cardigann/CardigannParser.cs b/src/NzbDrone.Core/Indexers/Definitions/Cardigann/CardigannParser.cs
index a48cd760d..5ad00524c 100644
--- a/src/NzbDrone.Core/Indexers/Definitions/Cardigann/CardigannParser.cs
+++ b/src/NzbDrone.Core/Indexers/Definitions/Cardigann/CardigannParser.cs
@@ -561,13 +561,18 @@ namespace NzbDrone.Core.Indexers.Cardigann
 
                     value = release.PosterUrl;
                     break;
-
-                //case "author":
-                //    release.Author = value;
-                //    break;
-                //case "booktitle":
-                //    release.BookTitle = value;
-                //    break;
+                case "author":
+                    release.Author = value;
+                    break;
+                case "booktitle":
+                    release.BookTitle = value;
+                    break;
+                case "artist":
+                    release.Artist = value;
+                    break;
+                case "album":
+                    release.Album = value;
+                    break;
                 default:
                     break;
             }
diff --git a/src/NzbDrone.Core/Parser/Model/ReleaseInfo.cs b/src/NzbDrone.Core/Parser/Model/ReleaseInfo.cs
index c2f023b60..23ce03963 100644
--- a/src/NzbDrone.Core/Parser/Model/ReleaseInfo.cs
+++ b/src/NzbDrone.Core/Parser/Model/ReleaseInfo.cs
@@ -31,6 +31,10 @@ namespace NzbDrone.Core.Parser.Model
         public int TvRageId { get; set; }
         public int ImdbId { get; set; }
         public int TmdbId { get; set; }
+        public string Author { get; set; }
+        public string BookTitle { get; set; }
+        public string Artist { get; set; }
+        public string Album { get; set; }
         public DateTime PublishDate { get; set; }
 
         public string PosterUrl { get; set; }
@@ -93,6 +97,7 @@ namespace NzbDrone.Core.Parser.Model
                     stringBuilder.AppendLine("TvdbId: " + TvdbId ?? "Empty");
                     stringBuilder.AppendLine("TvRageId: " + TvRageId ?? "Empty");
                     stringBuilder.AppendLine("ImdbId: " + ImdbId ?? "Empty");
+                    stringBuilder.AppendLine("TmdbId: " + TmdbId ?? "Empty");
                     stringBuilder.AppendLine("PublishDate: " + PublishDate ?? "Empty");
                     return stringBuilder.ToString();
                 default: