diff --git a/addons.xml b/addons.xml
index ac17922..8195caa 100644
--- a/addons.xml
+++ b/addons.xml
@@ -1,5 +1,31 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addons>
+<addon id="docker.linuxserver.couchpotato"
+       name="CouchPotato (LinuxServer.io)"
+       version="1.0.0"
+       provider-name="linuxserver.io">
+  <requires>
+    <import addon="os.libreelec.tv" version="7.0"/>
+    <import addon="xbmc.python" version="2.1.0"/>
+    <import addon="service.system.docker" version="0.0.0" />
+  </requires>
+  <extension point="xbmc.service" library="default.py">
+    <provides></provides>
+  </extension>
+  <extension point="xbmc.addon.metadata">
+    <summary>CouchPotato in a docker container</summary>
+    <description>
+CouchPotato is an automatic NZB and torrent downloader. You can keep a movies I want list and it will search for NZBs/torrents of these movies every X hours. Once a movie is found, it will send it to SABnzbd or download the torrent to a specified directory.
+
+This is a docker container brought to you by the LinuxServer team.
+Please visit www.linuxserver.io for more information.
+    </description>
+    <disclaimer>
+    </disclaimer>
+    <platform>all</platform>
+  </extension>
+</addon>
+
 <addon id="docker.linuxserver.duckdns"
        name="DuckDNS (LinuxServer.io)"
        version="1.0.0"
diff --git a/addons.xml.md5 b/addons.xml.md5
index 7d95598..dce7309 100644
--- a/addons.xml.md5
+++ b/addons.xml.md5
@@ -1 +1 @@
-52e65acef3bd497551ab7c8ed420a1ec
\ No newline at end of file
+ffd67e369029d9d160394eed9dd78a40
\ No newline at end of file
diff --git a/addons_xml_generator3.py b/addons_xml_generator3.py
index 28c6dee..914520a 100755
--- a/addons_xml_generator3.py
+++ b/addons_xml_generator3.py
@@ -22,7 +22,12 @@
 # *  https://offshoregit.com/tknorris/tknorris-release-repo/raw/master/addons_xml_generator2.py
 # *  Based on code by j48antialias:
 # *  https://anarchintosh-projects.googlecode.com/files/addons_xml_generator.py
- 
+# *
+# *  Changes since v2:
+# *  - (assumed) zips reside in folder "download"
+# *  - md5 checksum creation added for zips
+# *  - Skip moving files and zip creation if zip file for the same version already exists
+
 """ addons.xml generator """
 
 import os
@@ -159,37 +164,42 @@ if (__name__ == "__main__"):
                     for elem in root.iter('addon'):
                         print('%s %s version: %s' % (x, elem.tag, elem.attrib['version']))
                         version = '-' + elem.attrib['version']                  
-                # #check if and move addon, changelog, fanart and icon to zipdir                       
-                for y in filesinfoldertozip: 
-                    # print('processing file: ' + os.path.join(rootdir,x,y))
-                    if re.search("addon|changelog|icon|fanart", y):
-                        shutil.copyfile(os.path.join(rootdir, x, y), os.path.join(zipsfolder, y))
-                        print('Copying %s to %s' % (y, zipsfolder))                
-                # #check for and zip the folders
-                print('Zipping %s and moving to %s\n' % (x, zipsfolder))
-                try:
-                    zipfolder(zipfilenamefirstpart + version + zipfilenamelastpart, foldertozip, zipsfolder, x)
-                    print('zipped with zipfolder')
+                # # #check for existing zips
+                if not os.path.exists(zipsfolder + x + version + '.zip'):
+                    # #check if and move addon, changelog, fanart and icon to zipdir                       
+                    for y in filesinfoldertozip: 
+                        # print('processing file: ' + os.path.join(rootdir,x,y))
+                        if re.search("addon|changelog|icon|fanart", y):
+                            shutil.copyfile(os.path.join(rootdir, x, y), os.path.join(zipsfolder, y))
+                            print('Copying %s to %s' % (y, zipsfolder))                
+                    # #check for and zip the folders
+                    print('Zipping %s and moving to %s\n' % (x, zipsfolder))
                     try:
-                        import md5
-                        m = md5.new(open("%s" % (zipsfolder + x + version + '.zip'), "r").read()).hexdigest()
-                    except ImportError:
-                        import hashlib
-                        m = hashlib.md5(open("%s" % (zipsfolder + x + version + '.zip'), "r", encoding="UTF-8").read().encode("UTF-8")).hexdigest()
-                    try:
-                        open("%s" % (zipsfolder + x + version + '.zip.md5'), "wb").write(m.encode("UTF-8"))
-                        print("zip.md5 file created\n")
-                    except Exception as e:
-                        print("An error occurred creating zip.md5 file!\n%s" % e)
-                except:
-                    if os.path.exists(zipsfolder + x + version + '.zip'):
-                        os.remove(zipsfolder + x + version + '.zip')
-                        print('trying shutil')
-                    try:
-                        shutil.move(shutil.make_archive(foldertozip + version, 'zip', rootdir, x), zipsfolder)
-                        print('zipped with shutil\n')
-                    except Exception as e:
-                        print('Cannot create zip file\nshutil %s\n' % e)
+                        zipfolder(zipfilenamefirstpart + version + zipfilenamelastpart, foldertozip, zipsfolder, x)
+                        print('zipped with zipfolder')
+                        # # #create md5 checksum for zips
+                        try:
+                            import md5
+                            m = md5.new(open("%s" % (zipsfolder + x + version + '.zip'), "r").read()).hexdigest()
+                        except ImportError:
+                            import hashlib
+                            m = hashlib.md5(open("%s" % (zipsfolder + x + version + '.zip'), "r", encoding="UTF-8").read().encode("UTF-8")).hexdigest()
+                        try:
+                            open("%s" % (zipsfolder + x + version + '.zip.md5'), "wb").write(m.encode("UTF-8"))
+                            print("zip.md5 file created\n")
+                        except Exception as e:
+                            print("An error occurred creating zip.md5 file!\n%s" % e)
+                    except:
+                        if os.path.exists(zipsfolder + x + version + '.zip'):
+                            os.remove(zipsfolder + x + version + '.zip')
+                            print('trying shutil')
+                        try:
+                            shutil.move(shutil.make_archive(foldertozip + version, 'zip', rootdir, x), zipsfolder)
+                            print('zipped with shutil\n')
+                        except Exception as e:
+                            print('Cannot create zip file\nshutil %s\n' % e)
+                else:
+                    print('Zip file for %s version %s already exists, skipping moving files and zip creation.\n' % (x, version)) 
     except Exception as e:
         print('Cannot create or move the needed files\n%s' % e)
     print('Done')
diff --git a/docker.linuxserver.couchpotato/addon.xml b/docker.linuxserver.couchpotato/addon.xml
new file mode 100644
index 0000000..ee25817
--- /dev/null
+++ b/docker.linuxserver.couchpotato/addon.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<addon id="docker.linuxserver.couchpotato"
+       name="CouchPotato (LinuxServer.io)"
+       version="1.0.0"
+       provider-name="linuxserver.io">
+  <requires>
+    <import addon="os.libreelec.tv" version="7.0"/>
+    <import addon="xbmc.python" version="2.1.0"/>
+    <import addon="service.system.docker" version="0.0.0" />
+  </requires>
+  <extension point="xbmc.service" library="default.py">
+    <provides></provides>
+  </extension>
+  <extension point="xbmc.addon.metadata">
+    <summary>CouchPotato in a docker container</summary>
+    <description>
+CouchPotato is an automatic NZB and torrent downloader. You can keep a movies I want list and it will search for NZBs/torrents of these movies every X hours. Once a movie is found, it will send it to SABnzbd or download the torrent to a specified directory.
+
+This is a docker container brought to you by the LinuxServer team.
+Please visit www.linuxserver.io for more information.
+    </description>
+    <disclaimer>
+    </disclaimer>
+    <platform>all</platform>
+  </extension>
+</addon>
diff --git a/docker.linuxserver.couchpotato/bin/docker.linuxserver.couchpotato b/docker.linuxserver.couchpotato/bin/docker.linuxserver.couchpotato
new file mode 100644
index 0000000..63f3ffa
--- /dev/null
+++ b/docker.linuxserver.couchpotato/bin/docker.linuxserver.couchpotato
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+name="$(basename $0)"
+. /etc/profile
+oe_setup_addon "$name"
+docker rm "$name" 2>/dev/null
+docker pull linuxserver/couchpotato:latest
+[[ ! -z "$(docker images | grep 'linuxserver/couchpotato' | grep '<none>' | sed 's/\s\+/\t/g' | cut -f3)" ]] && \
+  docker rmi $(docker images | grep 'linuxserver/couchpotato' | grep '<none>' | sed 's/\s\+/\t/g' | cut -f3)
+docker run --name="$name" \
+           -e PUID="0" \
+           -e PGID="0" \
+           -e TZ="$(xmlstarlet sel -t -m '//timezone[1]' -v . -n </storage/.kodi/userdata/guisettings.xml)" \
+           -v "$V_config":/config \
+           -v "$V_movies":/movies \
+           -v "$V_downloads":/downloads \
+           -p "$P_port":5050 \
+           linuxserver/couchpotato:latest
diff --git a/docker.linuxserver.couchpotato/changelog.txt b/docker.linuxserver.couchpotato/changelog.txt
new file mode 100644
index 0000000..ad19199
--- /dev/null
+++ b/docker.linuxserver.couchpotato/changelog.txt
@@ -0,0 +1,5 @@
+docker.linuxserver.couchpotato:
+----------------------
+
+1.0.0
+-Initial release
diff --git a/docker.linuxserver.couchpotato/default.py b/docker.linuxserver.couchpotato/default.py
new file mode 100644
index 0000000..7f178dd
--- /dev/null
+++ b/docker.linuxserver.couchpotato/default.py
@@ -0,0 +1,18 @@
+
+import subprocess
+import xbmc
+import xbmcaddon
+
+
+class Monitor(xbmc.Monitor):
+
+   def __init__(self, *args, **kwargs):
+      xbmc.Monitor.__init__(self)
+      self.id = xbmcaddon.Addon().getAddonInfo('id')
+
+   def onSettingsChanged(self):
+      subprocess.call(['systemctl', 'restart', self.id])
+
+
+if __name__ == '__main__':
+   Monitor().waitForAbort()
diff --git a/docker.linuxserver.couchpotato/fanart.jpg b/docker.linuxserver.couchpotato/fanart.jpg
new file mode 100644
index 0000000..3a317ff
Binary files /dev/null and b/docker.linuxserver.couchpotato/fanart.jpg differ
diff --git a/docker.linuxserver.couchpotato/icon.png b/docker.linuxserver.couchpotato/icon.png
new file mode 100644
index 0000000..76a0b0c
Binary files /dev/null and b/docker.linuxserver.couchpotato/icon.png differ
diff --git a/docker.linuxserver.couchpotato/resources/language/English/strings.po b/docker.linuxserver.couchpotato/resources/language/English/strings.po
new file mode 100644
index 0000000..a787650
--- /dev/null
+++ b/docker.linuxserver.couchpotato/resources/language/English/strings.po
@@ -0,0 +1,26 @@
+msgid ""
+msgstr ""
+
+msgctxt "#30000"
+msgid "Configuration"
+msgstr ""
+
+msgctxt "#30001"
+msgid "Note: Kodi remote sources can not be used as Docker volume host sources"
+msgstr ""
+
+msgctxt "#30005"
+msgid "Map /config"
+msgstr ""
+
+msgctxt "#30006"
+msgid "Map /movies"
+msgstr ""
+
+msgctxt "#30007"
+msgid "Map /downloads"
+msgstr ""
+
+msgctxt "#30008"
+msgid "Listening port for web gui"
+msgstr ""
diff --git a/docker.linuxserver.couchpotato/resources/settings.xml b/docker.linuxserver.couchpotato/resources/settings.xml
new file mode 100644
index 0000000..e462d16
--- /dev/null
+++ b/docker.linuxserver.couchpotato/resources/settings.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<settings>
+   <category   label="30000">
+      <setting label="30001" type="lsep" />
+      <setting label="30005" type="folder" id="V_config"       default="/storage/.kodi/userdata/addon_data/docker.linuxserver.couchpotato/config"    option="writeable" />
+      <setting label="30006" type="folder" id="V_movies"       default="/storage/videos"                                                           option="writeable" />
+      <setting label="30007" type="folder" id="V_downloads"    default="/storage/.kodi/userdata/addon_data/docker.linuxserver.couchpotato/downloads" option="writeable" />
+      <setting label="30008" type="number" id="P_port"         default="5050" />
+   </category>
+</settings>
diff --git a/docker.linuxserver.couchpotato/settings-default.xml b/docker.linuxserver.couchpotato/settings-default.xml
new file mode 100644
index 0000000..bc08346
--- /dev/null
+++ b/docker.linuxserver.couchpotato/settings-default.xml
@@ -0,0 +1,6 @@
+<settings>
+    <setting id="V_config" value="/storage/.kodi/userdata/addon_data/docker.linuxserver.couchpotato/config" />/
+    <setting id="V_movies" value="/storage/videos" />
+    <setting id="V_downloads" value="/storage/.kodi/userdata/addon_data/docker.linuxserver.couchpotato/downloads" />
+    <setting id="P_port" value="5050" />
+</settings>
diff --git a/docker.linuxserver.couchpotato/system.d/docker.linuxserver.couchpotato.service b/docker.linuxserver.couchpotato/system.d/docker.linuxserver.couchpotato.service
new file mode 100644
index 0000000..1250444
--- /dev/null
+++ b/docker.linuxserver.couchpotato/system.d/docker.linuxserver.couchpotato.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=%p container
+Requires=service.system.docker.service
+After=service.system.docker.service
+
+[Service]
+Restart=always
+RestartSec=10s
+TimeoutStartSec=0
+ExecStart=/bin/sh /storage/.kodi/addons/%p/bin/%p
+ExecStop=/storage/.kodi/addons/service.system.docker/bin/docker kill %p
+
+[Install]
+WantedBy=multi-user.target
diff --git a/download/docker.linuxserver.couchpotato/addon.xml b/download/docker.linuxserver.couchpotato/addon.xml
new file mode 100644
index 0000000..ee25817
--- /dev/null
+++ b/download/docker.linuxserver.couchpotato/addon.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<addon id="docker.linuxserver.couchpotato"
+       name="CouchPotato (LinuxServer.io)"
+       version="1.0.0"
+       provider-name="linuxserver.io">
+  <requires>
+    <import addon="os.libreelec.tv" version="7.0"/>
+    <import addon="xbmc.python" version="2.1.0"/>
+    <import addon="service.system.docker" version="0.0.0" />
+  </requires>
+  <extension point="xbmc.service" library="default.py">
+    <provides></provides>
+  </extension>
+  <extension point="xbmc.addon.metadata">
+    <summary>CouchPotato in a docker container</summary>
+    <description>
+CouchPotato is an automatic NZB and torrent downloader. You can keep a movies I want list and it will search for NZBs/torrents of these movies every X hours. Once a movie is found, it will send it to SABnzbd or download the torrent to a specified directory.
+
+This is a docker container brought to you by the LinuxServer team.
+Please visit www.linuxserver.io for more information.
+    </description>
+    <disclaimer>
+    </disclaimer>
+    <platform>all</platform>
+  </extension>
+</addon>
diff --git a/download/docker.linuxserver.couchpotato/changelog.txt b/download/docker.linuxserver.couchpotato/changelog.txt
new file mode 100644
index 0000000..ad19199
--- /dev/null
+++ b/download/docker.linuxserver.couchpotato/changelog.txt
@@ -0,0 +1,5 @@
+docker.linuxserver.couchpotato:
+----------------------
+
+1.0.0
+-Initial release
diff --git a/download/docker.linuxserver.couchpotato/docker.linuxserver.couchpotato-1.0.0.zip b/download/docker.linuxserver.couchpotato/docker.linuxserver.couchpotato-1.0.0.zip
new file mode 100644
index 0000000..202fc4a
Binary files /dev/null and b/download/docker.linuxserver.couchpotato/docker.linuxserver.couchpotato-1.0.0.zip differ
diff --git a/download/docker.linuxserver.couchpotato/docker.linuxserver.couchpotato-1.0.0.zip.md5 b/download/docker.linuxserver.couchpotato/docker.linuxserver.couchpotato-1.0.0.zip.md5
new file mode 100644
index 0000000..6febb7b
--- /dev/null
+++ b/download/docker.linuxserver.couchpotato/docker.linuxserver.couchpotato-1.0.0.zip.md5
@@ -0,0 +1 @@
+fa043ec398879cdd6fbe4c45766d0ba4
\ No newline at end of file
diff --git a/download/docker.linuxserver.couchpotato/fanart.jpg b/download/docker.linuxserver.couchpotato/fanart.jpg
new file mode 100644
index 0000000..3a317ff
Binary files /dev/null and b/download/docker.linuxserver.couchpotato/fanart.jpg differ
diff --git a/download/docker.linuxserver.couchpotato/icon.png b/download/docker.linuxserver.couchpotato/icon.png
new file mode 100644
index 0000000..76a0b0c
Binary files /dev/null and b/download/docker.linuxserver.couchpotato/icon.png differ
diff --git a/download/docker.linuxserver.duckdns/docker.linuxserver.duckdns-1.0.0.zip b/download/docker.linuxserver.duckdns/docker.linuxserver.duckdns-1.0.0.zip
index 6a206ab..211bb71 100644
Binary files a/download/docker.linuxserver.duckdns/docker.linuxserver.duckdns-1.0.0.zip and b/download/docker.linuxserver.duckdns/docker.linuxserver.duckdns-1.0.0.zip differ
diff --git a/download/docker.linuxserver.duckdns/docker.linuxserver.duckdns-1.0.0.zip.md5 b/download/docker.linuxserver.duckdns/docker.linuxserver.duckdns-1.0.0.zip.md5
index 5f670f7..2454c62 100644
--- a/download/docker.linuxserver.duckdns/docker.linuxserver.duckdns-1.0.0.zip.md5
+++ b/download/docker.linuxserver.duckdns/docker.linuxserver.duckdns-1.0.0.zip.md5
@@ -1 +1 @@
-d33fea8cc9f5b3782ad9af7fabdd49c6
\ No newline at end of file
+169700d732329d035ba807182af7aaa6
\ No newline at end of file
diff --git a/download/docker.linuxserver.plex/docker.linuxserver.plex-1.0.0.zip b/download/docker.linuxserver.plex/docker.linuxserver.plex-1.0.0.zip
index 4475489..21f623e 100644
Binary files a/download/docker.linuxserver.plex/docker.linuxserver.plex-1.0.0.zip and b/download/docker.linuxserver.plex/docker.linuxserver.plex-1.0.0.zip differ
diff --git a/download/docker.linuxserver.plex/docker.linuxserver.plex-1.0.0.zip.md5 b/download/docker.linuxserver.plex/docker.linuxserver.plex-1.0.0.zip.md5
index d91429e..2c4d546 100644
--- a/download/docker.linuxserver.plex/docker.linuxserver.plex-1.0.0.zip.md5
+++ b/download/docker.linuxserver.plex/docker.linuxserver.plex-1.0.0.zip.md5
@@ -1 +1 @@
-ce84f9acc8663a099219a42e59f1eac6
\ No newline at end of file
+33d6545cd9670027cb82c37876011191
\ No newline at end of file
diff --git a/download/repository.linuxserver.x86/repository.linuxserver.x86-1.0.0.zip b/download/repository.linuxserver.x86/repository.linuxserver.x86-1.0.0.zip
index 163c17e..02cc346 100644
Binary files a/download/repository.linuxserver.x86/repository.linuxserver.x86-1.0.0.zip and b/download/repository.linuxserver.x86/repository.linuxserver.x86-1.0.0.zip differ
diff --git a/download/repository.linuxserver.x86/repository.linuxserver.x86-1.0.0.zip.md5 b/download/repository.linuxserver.x86/repository.linuxserver.x86-1.0.0.zip.md5
index 7975d60..0edf78f 100644
--- a/download/repository.linuxserver.x86/repository.linuxserver.x86-1.0.0.zip.md5
+++ b/download/repository.linuxserver.x86/repository.linuxserver.x86-1.0.0.zip.md5
@@ -1 +1 @@
-46dbe0fc602039cfdf1a084e0b4fb926
\ No newline at end of file
+ad121193d57d9d55ab7e50d20e388a03
\ No newline at end of file