diff --git a/autoProcess/autoProcessMovie.py b/autoProcess/autoProcessMovie.py
index a0d2605c..5646156f 100644
--- a/autoProcess/autoProcessMovie.py
+++ b/autoProcess/autoProcessMovie.py
@@ -202,6 +202,11 @@ def process(dirName, nzbName=None, status=0, clientAgent = "manual", download_id
     except (ConfigParser.NoOptionError, ValueError):
         transcode = 0
 
+    try:
+        remoteCPS = int(config.get("CouchPotato", "remoteCPS"))
+    except (ConfigParser.NoOptionError, ValueError):
+        remoteCPS = 0
+
     nzbName = str(nzbName) # make sure it is a string
     
     imdbid = get_imdb(nzbName, dirName)
@@ -235,7 +240,10 @@ def process(dirName, nzbName=None, status=0, clientAgent = "manual", download_id
         else:
             command = "renamer.scan"
             if clientAgent != "manual" and download_id != "none":
-                command = command + "/?movie_folder=" + dirName + "&downloader=" + clientAgent + "&download_id=" + download_id
+                if remoteCPS == 1:
+                    command = command + "/?downloader=" + clientAgent + "&download_id=" + download_id
+                else:
+                    command = command + "/?movie_folder=" + dirName + "&downloader=" + clientAgent + "&download_id=" + download_id
 
         url = baseURL + command
 
diff --git a/autoProcess/migratecfg.py b/autoProcess/migratecfg.py
index ecd1018a..2896a83b 100644
--- a/autoProcess/migratecfg.py
+++ b/autoProcess/migratecfg.py
@@ -231,8 +231,8 @@ def addnzbget():
     confignew.read(configFilenamenew)
 
     section = "CouchPotato"
-    envKeys = ['CATEGORY', 'APIKEY', 'HOST', 'PORT', 'SSL', 'WEB_ROOT', 'DELAY', 'METHOD', 'DELETE_FAILED']
-    cfgKeys = ['cpsCategory', 'apikey', 'host', 'port', 'ssl', 'web_root', 'delay', 'method', 'delete_failed']
+    envKeys = ['CATEGORY', 'APIKEY', 'HOST', 'PORT', 'SSL', 'WEB_ROOT', 'DELAY', 'METHOD', 'DELETE_FAILED', 'REMOTECPS']
+    cfgKeys = ['cpsCategory', 'apikey', 'host', 'port', 'ssl', 'web_root', 'delay', 'method', 'delete_failed', 'remoteCPS']
     for index in range(len(envKeys)):
         key = 'NZBPO_CPS' + envKeys[index]
         if os.environ.has_key(key):
diff --git a/autoProcessMedia.cfg.sample b/autoProcessMedia.cfg.sample
index bd12838b..8cd88d31 100644
--- a/autoProcessMedia.cfg.sample
+++ b/autoProcessMedia.cfg.sample
@@ -15,6 +15,8 @@ delay = 65
 method = renamer
 delete_failed = 0
 wait_for = 2
+#### Set to 1 if CouchPotatoServer is running on a different server to your NZB client
+remoteCPS = 0
 
 
 [SickBeard]
diff --git a/changelog.txt b/changelog.txt
index 596443f1..dd178530 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,10 +1,18 @@
 Change_LOG / History
 
-VX.X XX/XX/2013
+V8.3 11/07/2013
 
 Impacts All
 Allow use of experimental AAC codec in transcoder.
-Remove username and password when api key is used. 
+Remove username and password when api key is used.
+Add .m4v as media
+Added ResetDateTime.py
+Manual Opion for Mylar script.
+Fixes for Gamez script.
+
+Impacts NZBs
+Added option to remove folder path when CouchPotato on different system to downlaoder.
+NZBGet v11.0 stable now current.
 
 
 V8.2 26/05/2013
diff --git a/nzbToCouchPotato.py b/nzbToCouchPotato.py
index 736c8bfa..3ca3f5ff 100755
--- a/nzbToCouchPotato.py
+++ b/nzbToCouchPotato.py
@@ -53,6 +53,11 @@
 # set to 1 to delete failed, or 0 to leave files in place.
 #cpsdelete_failed=0
 
+# CouchPotatoServer and NZBGet are on same system (0, 1).
+#
+# set to 1 if CouchPotato and NZBGet are on the same system, or 0 if on teh same system.
+#remoteCPS = 0
+
 ## Extensions
 
 # Media Extensions
diff --git a/nzbToMedia.py b/nzbToMedia.py
index 1f70ee3c..e853bb2e 100755
--- a/nzbToMedia.py
+++ b/nzbToMedia.py
@@ -53,6 +53,11 @@
 # set to 1 to delete failed, or 0 to leave files in place.
 #cpsdelete_failed=0
 
+# CouchPotatoServer and NZBGet are on same system (0, 1).
+#
+# set to 1 if CouchPotato and NZBGet are on the same system, or 0 if on teh same system.
+#remoteCPS = 0
+
 ## SickBeard
 
 # SickBeard script category.