diff --git a/MediaBrowser.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs b/MediaBrowser.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs
index 961e5e500..a8b8359d8 100644
--- a/MediaBrowser.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs
+++ b/MediaBrowser.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs
@@ -157,6 +157,12 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Movies
                     continue;
                 }
 
+                // Don't misidentify xbmc trailers as a movie
+                if (child.Name.IndexOf("-trailer", StringComparison.OrdinalIgnoreCase) != -1)
+                {
+                    continue;
+                }
+
                 var childArgs = new ItemResolveArgs(ApplicationPaths)
                 {
                     FileInfo = child,