diff --git a/couchpotato/core/providers/metadata/xbmc/__init__.py b/couchpotato/core/providers/metadata/xbmc/__init__.py
index 2a9510e..71de827 100644
--- a/couchpotato/core/providers/metadata/xbmc/__init__.py
+++ b/couchpotato/core/providers/metadata/xbmc/__init__.py
@@ -20,19 +20,41 @@ config = [{
                 },
                 {
                     'name': 'meta_nfo',
+                    'label': 'NFO',
                     'default': True,
                     'type': 'bool',
                 },
                 {
+                    'name': 'meta_nfo_name',
+                    'label': 'NFO filename',
+                    'default': '%s.nfo',
+                    'advanced': True,
+                    'description': '<strong>%s</strong> is the rootname of the movie. For example "/path/to/movie cd1.mkv" will be "/path/to/movie"'
+                },
+                {
                     'name': 'meta_fanart',
+                    'label': 'Fanart',
                     'default': True,
                     'type': 'bool',
                 },
                 {
+                    'name': 'meta_fanart_name',
+                    'label': 'Fanart filename',
+                    'default': '%s-fanart.jpg',
+                    'advanced': True,
+                },
+                {
                     'name': 'meta_thumbnail',
+                    'label': 'Thumbnail',
                     'default': True,
                     'type': 'bool',
                 },
+                {
+                    'name': 'meta_thumbnail_name',
+                    'label': 'Thumbnail filename',
+                    'default': '%s.tbn',
+                    'advanced': True,
+                },
             ],
         },
     ],
diff --git a/couchpotato/core/providers/metadata/xbmc/main.py b/couchpotato/core/providers/metadata/xbmc/main.py
index 2908c6f..7797cce 100644
--- a/couchpotato/core/providers/metadata/xbmc/main.py
+++ b/couchpotato/core/providers/metadata/xbmc/main.py
@@ -15,13 +15,13 @@ class XBMC(MetaDataBase):
         return os.path.join(data['destination_dir'], data['filename'])
 
     def getFanartName(self, root):
-        return '%s-fanart.jpg' % root
+        return self.conf('meta_fanart_name') % root
 
     def getThumbnailName(self, root):
-        return '%s.tbn' % root
+        return self.conf('meta_thumbnail_name') % root
 
     def getNfoName(self, root):
-        return '%s.nfo' % root
+        return self.conf('meta_nfo_name') % root
 
     def getNfo(self, movie_info = {}, data = {}):
         nfoxml = Element('movie')