diff --git a/src/NzbDrone.Core.Test/MediaFiles/RenameTrackFileServiceFixture.cs b/src/NzbDrone.Core.Test/MediaFiles/RenameTrackFileServiceFixture.cs
index 04bb6ba70..0818d00bf 100644
--- a/src/NzbDrone.Core.Test/MediaFiles/RenameTrackFileServiceFixture.cs
+++ b/src/NzbDrone.Core.Test/MediaFiles/RenameTrackFileServiceFixture.cs
@@ -33,6 +33,10 @@ namespace NzbDrone.Core.Test.MediaFiles
             Mocker.GetMock<IAuthorService>()
                   .Setup(s => s.GetAuthor(_author.Id))
                   .Returns(_author);
+
+            Mocker.GetMock<IMediaFileService>()
+                .Setup(s => s.GetFilesByAuthor(_author.Id))
+                .Returns(_trackFiles);
         }
 
         private void GivenNoTrackFiles()
diff --git a/src/NzbDrone.Core/MediaFiles/RenameBookFileService.cs b/src/NzbDrone.Core/MediaFiles/RenameBookFileService.cs
index 7d182bc6d..1bbe61971 100644
--- a/src/NzbDrone.Core/MediaFiles/RenameBookFileService.cs
+++ b/src/NzbDrone.Core/MediaFiles/RenameBookFileService.cs
@@ -113,12 +113,15 @@ namespace NzbDrone.Core.MediaFiles
 
         private void RenameFiles(List<BookFile> bookFiles, Author author)
         {
+            var allFiles = _mediaFileService.GetFilesByAuthor(author.Id);
+            var counts = allFiles.GroupBy(x => x.EditionId).ToDictionary(g => g.Key, g => g.Count());
             var renamed = new List<BookFile>();
 
             // Don't rename Calibre files
             foreach (var bookFile in bookFiles.Where(x => x.CalibreId == 0))
             {
                 var bookFilePath = bookFile.Path;
+                bookFile.PartCount = counts[bookFile.EditionId];
 
                 try
                 {