diff --git a/couchpotato/core/providers/torrent/torrentpotato/__init__.py b/couchpotato/core/providers/torrent/torrentpotato/__init__.py
new file mode 100644
index 0000000..5054f98
--- /dev/null
+++ b/couchpotato/core/providers/torrent/torrentpotato/__init__.py
@@ -0,0 +1,66 @@
+from .main import TorrentPotato
+
+def start():
+    return TorrentPotato()
+
+config = [{
+    'name': 'torrentpotato',
+    'groups': [
+        {
+            'tab': 'searcher',
+            'list': 'torrent_providers',
+            'name': 'TorrentPotato',
+            'order': 10,
+            'description': 'CouchPotato torrent provider. Checkout <a href="https://github.com/RuudBurger/CouchPotatoServer/wiki/CouchPotato-Torrent-Provider">the wiki page about this provider</a> for more info.',
+            'wizard': True,
+            'options': [
+                {
+                    'name': 'enabled',
+                    'type': 'enabler',
+                    'default': False,
+                },
+                {
+                    'name': 'use',
+                    'default': ''
+                },
+                {
+                    'name': 'host',
+                    'default': '',
+                    'description': 'The url path of your TorrentPotato provider.',
+                },
+                {
+                    'name': 'extra_score',
+                    'advanced': True,
+                    'label': 'Extra Score',
+                    'default': '0',
+                    'description': 'Starting score for each release found via this provider.',
+                },
+                {
+                    'name': 'name',
+                    'label': 'Username',
+                    'default': '',
+                },
+                {
+                    'name': 'seed_ratio',
+                    'label': 'Seed ratio',
+                    'default': '1',
+                    'description': 'Will not be (re)moved until this seed ratio is met.',
+                },
+                {
+                    'name': 'seed_time',
+                    'label': 'Seed time',
+                    'default': '40',
+                    'description': 'Will not be (re)moved until this seed time (in hours) is met.',
+                },
+                {
+                    'name': 'pass_key',
+                    'default': ',',
+                    'label': 'Pass Key',
+                    'description': 'Can be found on your profile page',
+                    'type': 'combined',
+                    'combine': ['use', 'host', 'pass_key', 'name', 'seed_ratio', 'seed_time', 'extra_score'],
+                },
+            ],
+        },
+    ],
+}]
diff --git a/couchpotato/core/providers/torrent/torrentpotato/main.py b/couchpotato/core/providers/torrent/torrentpotato/main.py
new file mode 100644
index 0000000..a81d0ed
--- /dev/null
+++ b/couchpotato/core/providers/torrent/torrentpotato/main.py
@@ -0,0 +1,129 @@
+from couchpotato.core.helpers.encoding import tryUrlencode, toUnicode
+from couchpotato.core.helpers.variable import splitString, tryInt, tryFloat
+from couchpotato.core.logger import CPLog
+from couchpotato.core.providers.base import ResultList
+from couchpotato.core.providers.torrent.base import TorrentProvider
+from urlparse import urlparse
+import re
+import traceback
+
+log = CPLog(__name__)
+
+
+class TorrentPotato(TorrentProvider):
+
+    urls = {}
+    limits_reached = {}
+
+    http_time_between_calls = 1 # Seconds
+
+    def search(self, movie, quality):
+        hosts = self.getHosts()
+
+        results = ResultList(self, movie, quality, imdb_results = True)
+
+        for host in hosts:
+            if self.isDisabled(host):
+                continue
+
+            self._searchOnHost(host, movie, quality, results)
+
+        return results
+
+    def _searchOnHost(self, host, movie, quality, results):
+
+        arguments = tryUrlencode({
+            'user': host['name'],
+            'passkey': host['pass_key'],
+            'imdbid': movie['library']['identifier']
+        })
+        url = '%s?%s' % (host['host'], arguments)
+
+        torrents = self.getJsonData(url, cache_timeout = 1800)
+
+        if torrents:
+            try:
+                if torrents.get('error'):
+                    log.error('%s: %s', (torrents.get('error'), host['host']))
+                elif torrents.get('results'):
+                    for torrent in torrents.get('results', []):
+                        results.append({
+                            'id': torrent.get('torrent_id'),
+                            'protocol': 'torrent' if re.match('^(http|https|ftp)://.*$', torrent.get('download_url')) else 'torrent_magnet',
+                            'provider_extra': urlparse(host['host']).hostname or host['host'],
+                            'name': toUnicode(torrent.get('release_name')),
+                            'url': torrent.get('download_url'),
+                            'detail_url': torrent.get('details_url'),
+                            'size': torrent.get('size'),
+                            'score': host['extra_score'],
+                            'seeders': torrent.get('seeders'),
+                            'leechers': torrent.get('leechers'),
+                            'seed_ratio': host['seed_ratio'],
+                            'seed_time': host['seed_time'],
+                        })
+
+            except:
+                log.error('Failed getting results from %s: %s', (host['host'], traceback.format_exc()))
+
+    def getHosts(self):
+
+        uses = splitString(str(self.conf('use')), clean = False)
+        hosts = splitString(self.conf('host'), clean = False)
+        names = splitString(self.conf('name'), clean = False)
+        seed_times = splitString(self.conf('seed_time'), clean = False)
+        seed_ratios = splitString(self.conf('seed_ratio'), clean = False)
+        pass_keys = splitString(self.conf('pass_key'), clean = False)
+        extra_score = splitString(self.conf('extra_score'), clean = False)
+
+        list = []
+        for nr in range(len(hosts)):
+
+            try: key = pass_keys[nr]
+            except: key = ''
+
+            try: host = hosts[nr]
+            except: host = ''
+
+            try: name = names[nr]
+            except: name = ''
+
+            try: ratio = seed_ratios
+            except: ratio = ''
+
+            try: seed_time = seed_times
+            except: seed_time = ''
+
+            list.append({
+                'use': uses[nr],
+                'host': host,
+                'name': name,
+                'seed_ratio': tryFloat(ratio),
+                'seed_time': tryInt(seed_time),
+                'pass_key': key,
+                'extra_score': tryInt(extra_score[nr]) if len(extra_score) > nr else 0
+            })
+
+        return list
+
+    def belongsTo(self, url, provider = None, host = None):
+
+        hosts = self.getHosts()
+
+        for host in hosts:
+            result = super(TorrentPotato, self).belongsTo(url, host = host['host'], provider = provider)
+            if result:
+                return result
+
+    def isDisabled(self, host = None):
+        return not self.isEnabled(host)
+
+    def isEnabled(self, host = None):
+
+    # Return true if at least one is enabled and no host is given
+        if host is None:
+            for host in self.getHosts():
+                if self.isEnabled(host):
+                    return True
+            return False
+
+        return TorrentProvider.isEnabled(self) and host['host'] and host['pass_key'] and int(host['use'])
diff --git a/couchpotato/static/style/settings.css b/couchpotato/static/style/settings.css
index 996d04f..f3df286 100644
--- a/couchpotato/static/style/settings.css
+++ b/couchpotato/static/style/settings.css
@@ -545,12 +545,31 @@
 		.page .combined_table .head abbr:first-child {
 			display: none;
 		}
-		.page .combined_table .head abbr.host {
-			margin-right: 190px;
+		.page .combined_table .head abbr.host { margin-right: 120px; }
+			.page .combined_table input.host { width: 140px; }
+		.page .section_newznab .combined_table .head abbr.host { margin-right: 200px; }
+			.page .section_newznab .combined_table input.host { width: 220px; }
+			
+		.page .combined_table .head abbr.name { margin-right: 57px; }
+			.page .combined_table input.name { width: 120px; }
+		.page .combined_table .head abbr.api_key { margin-right: 75px; }
+		
+		.page .combined_table .head abbr.pass_key { margin-right: 71px; }
+			.page .combined_table input.pass_key { width: 113px; }
+			
+		.page .section_newznab .combined_table .head abbr.api_key { margin-right: 185px; }
+			.page .section_newznab .combined_table input.api_key { width: 223px; }
+			
+		.page .combined_table .seed_ratio,
+		.page .combined_table .seed_time {
+			width: 70px;
+			text-align: center;
+			margin-left: 10px;
 		}
-		.page .combined_table .head abbr.api_key {
-			margin-right: 171px;
+		.page .combined_table .seed_time {
+			margin-right: 10px;
 		}
+		
 		.page .combined_table .head .extra_score,
 		.page .combined_table .extra_score {
 			width: 70px;
@@ -715,4 +734,4 @@
 		display: inline-block;
 		top: 1px;
 		left: 6px;
-	}
\ No newline at end of file
+	}