diff --git a/couchpotato/environment.py b/couchpotato/environment.py
index 1000d48..08e12c0 100644
--- a/couchpotato/environment.py
+++ b/couchpotato/environment.py
@@ -14,6 +14,7 @@ class Env(object):
     ''' Environment variables '''
     _app = None
     _encoding = 'UTF-8'
+    _fs_encoding = 'UTF-8'
     _debug = False
     _dev = False
     _settings = Settings()
diff --git a/couchpotato/runner.py b/couchpotato/runner.py
index 93958ba..f753f82 100644
--- a/couchpotato/runner.py
+++ b/couchpotato/runner.py
@@ -86,6 +86,7 @@ def runCouchPotato(options, base_path, args, data_dir = None, log_dir = None, En
         encoding = 'UTF-8'
 
     Env.set('encoding', encoding)
+    Env.set('fs_encoding', sys.getfilesystemencoding())
 
     # Do db stuff
     db_path = sp(os.path.join(data_dir, 'database'))