diff --git a/couchpotato/core/providers/metadata/xbmc/main.py b/couchpotato/core/providers/metadata/xbmc/main.py
index 5763ea24..d1f0feed 100644
--- a/couchpotato/core/providers/metadata/xbmc/main.py
+++ b/couchpotato/core/providers/metadata/xbmc/main.py
@@ -86,6 +86,16 @@ class XBMC(MetaDataBase):
             name = SubElement(actors, 'name')
             name.text = toUnicode(actor)
 
+        # Directors
+        for director in movie_info.get('directors', []):
+            director = SubElement(nfoxml, 'director')
+            director.text = toUnicode(director)
+
+        # Writers
+        for writer in movie_info.get('writers', []):
+            writers = SubElement(nfoxml, 'credits')
+            writers.text = toUnicode(writer)
+
 
         # Clean up the xml and return it
         nfoxml = xml.dom.minidom.parseString(tostring(nfoxml))
diff --git a/couchpotato/core/providers/movie/imdbapi/main.py b/couchpotato/core/providers/movie/imdbapi/main.py
index 2b0647aa..be8577e3 100644
--- a/couchpotato/core/providers/movie/imdbapi/main.py
+++ b/couchpotato/core/providers/movie/imdbapi/main.py
@@ -69,7 +69,8 @@ class IMDBAPI(MovieProvider):
                 'year': movie.get('Year', ''),
                 'plot': movie.get('Plot', ''),
                 'genres': movie.get('Genre').split(','),
-                'director': movie.get('Director', ''),
+                'director': movie.get('Director', '').split(','),
+                'writer': movie.get('Writer', '').split(','),
                 'actors': movie.get('Actors', '').split(','),
             }
         except: