diff --git a/CHANGES.md b/CHANGES.md
index 930192f8..292e78ec 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -53,6 +53,7 @@
 * Add MagnetDL torrent provider
 * Add SceneHD torrent provider
 * Add Skytorrents torrent provider
+* Add WorldOfP2P torrent provider
 * Change do not have shows checked by default on import page. To re-enable import shows checked by default,
   1) On config page 'Save' 2) Stop SG 3) Find 'import_default_checked_shows' in config.ini and set '1' 4) Start SG
 * Add Nyaa (.si) torrent provider
diff --git a/gui/slick/images/providers/wop.png b/gui/slick/images/providers/wop.png
new file mode 100644
index 00000000..6053085e
Binary files /dev/null and b/gui/slick/images/providers/wop.png differ
diff --git a/sickbeard/providers/__init__.py b/sickbeard/providers/__init__.py
index 628a32e2..11403176 100755
--- a/sickbeard/providers/__init__.py
+++ b/sickbeard/providers/__init__.py
@@ -31,7 +31,7 @@ from . import alpharatio, beyondhd, bithdtv, bitmetv, btn, btscene, dh, \
     iptorrents, limetorrents, magnetdl, morethan, nebulance, ncore, nyaa, pisexy, pretome, privatehd, ptf, \
     rarbg, revtt, scenehd, scenetime, shazbat, skytorrents, speedcd, \
     thepiratebay, torlock, torrentday, torrenting, torrentleech, \
-    torrentz2, tvchaosuk, zooqle
+    torrentz2, tvchaosuk, wop, zooqle
 # anime
 from . import anizb, tokyotoshokan
 # custom
@@ -84,6 +84,7 @@ __all__ = ['omgwtfnzbs',
            'torrentleech',
            'torrentz2',
            'tvchaosuk',
+           'wop',
            'zooqle',
            'tokyotoshokan',
            ]
diff --git a/sickbeard/providers/generic.py b/sickbeard/providers/generic.py
index 82912e11..e2bd620f 100644
--- a/sickbeard/providers/generic.py
+++ b/sickbeard/providers/generic.py
@@ -335,10 +335,12 @@ class GenericProvider:
             url_tmpl = '%s'
         return url if re.match('(?i)(https?://|magnet:)', url) else (url_tmpl % url.lstrip('/'))
 
-    def _header_row(self, table_row, custom_match=None, header_strip=''):
+    @staticmethod
+    def _header_row(table_row, custom_match=None, custom_tags=None, header_strip=''):
         """
         :param header_row: Soup resultset of table header row
         :param custom_match: Dict key/values to override one or more default regexes
+        :param custom_tags: List of tuples with tag and attribute
         :param header_strip: String regex of ambiguities to remove from headers
         :return: dict column indices or None for leech, seeds, and size
         """
@@ -363,7 +365,7 @@ class GenericProvider:
                     cell.find(tag, **p) for p in [{attr: rc[x]} for x in rc.keys()]]))), {}).get(attr)
                 for (tag, attr) in [
                     ('img', 'title'), ('img', 'src'), ('i', 'title'), ('i', 'class'),
-                    ('abbr', 'title'), ('a', 'title'), ('a', 'href')]]))), '')
+                    ('abbr', 'title'), ('a', 'title'), ('a', 'href')] + (custom_tags or [])]))), '')
              or cell.get_text()
              )).strip() for cell in all_cells]
         headers = [re.sub(header_strip, '', x) for x in headers]
@@ -523,9 +525,8 @@ class GenericProvider:
                         logger.log(u'The result ' + title + u' doesn\'t seem to be a valid season that we are trying' +
                                    u' to snatch, ignoring', logger.DEBUG)
                         add_cache_entry = True
-                    elif len(parse_result.episode_numbers)\
-                            and not [ep for ep in episodes
-                                     if ep.season == parse_result.season_number and
+                    elif len(parse_result.episode_numbers) and not [
+                        ep for ep in episodes if ep.season == parse_result.season_number and
                             ep.episode in parse_result.episode_numbers]:
                         logger.log(u'The result ' + title + ' doesn\'t seem to be a valid episode that we are trying' +
                                    u' to snatch, ignoring', logger.DEBUG)
@@ -699,7 +700,8 @@ class GenericProvider:
             pass
         return long(math.ceil(value))
 
-    def _should_stop(self):
+    @staticmethod
+    def _should_stop():
         if getattr(threading.currentThread(), 'stop', False):
             return True
         return False
@@ -954,8 +956,8 @@ class TorrentProvider(object, GenericProvider):
 
     @staticmethod
     def _has_signature(data=None):
-        return data and re.search(r'(?sim)<input[^<]+name="password"', data) and \
-               re.search(r'(?sim)<input[^<]+name="username"', data)
+        return data and re.search(r'(?sim)<input[^<]+?name=["\'\s]*?password', data) and \
+               re.search(r'(?sim)<input[^<]+?name=["\'\s]*?username', data)
 
     def _valid_home(self, attempt_fetch=True):
         """
diff --git a/sickbeard/providers/wop.py b/sickbeard/providers/wop.py
new file mode 100644
index 00000000..f89e24ce
--- /dev/null
+++ b/sickbeard/providers/wop.py
@@ -0,0 +1,138 @@
+# coding=utf-8
+#
+# This file is part of SickGear.
+#
+# SickGear is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# SickGear is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with SickGear.  If not, see <http://www.gnu.org/licenses/>.
+
+import re
+import traceback
+
+from . import generic
+from sickbeard import logger
+from sickbeard.bs4_parser import BS4Parser
+from sickbeard.helpers import tryInt
+from lib.unidecode import unidecode
+
+
+class WOPProvider(generic.TorrentProvider):
+
+    def __init__(self):
+        generic.TorrentProvider.__init__(self, 'WOP', cache_update_freq=10)
+
+        self.url_home = ['https://www.worldofp2p.net/']
+
+        self.url_vars = {'login': 'getrss.php', 'search': 'browse.php?%s' % '&'.join(
+            ['search=%s', 'searchin=title', 'incldead=0', 'sort=4', 'type=desc', '%s']), 'get': '%s'}
+        self.url_tmpl = {'config_provider_home_uri': '%(home)s', 'login': '%(home)s%(vars)s',
+                         'search': '%(home)s%(vars)s', 'get': '%(home)s%(vars)s'}
+
+        self.categories = {'Season': [41], 'Episode': [35, 5, 58, 42, 36, 55, 39, 37, 54, 38]}
+        self.categories['Cache'] = self.categories['Season'] + self.categories['Episode']
+
+        self.digest, self.freeleech, self.minseed, self.minleech = 4 * [None]
+
+    def _authorised(self, **kwargs):
+
+        return super(WOPProvider, self)._authorised(
+            logged_in=(lambda y=None: all(
+                [(None is y or re.search('(?i)rss\slink', y)), self.has_all_cookies()] +
+                [(self.session.cookies.get(x) or 'sg!no!pw') in self.digest for x in ['hashv']])),
+            failed_msg=(lambda y=None: u'Invalid cookie details for %s. Check settings'))
+
+    @staticmethod
+    def _has_signature(data=None):
+        return generic.TorrentProvider._has_signature(data) or (data and re.search(r'(?sim)<title[^<]+WOP', data))
+
+    def _search_provider(self, search_params, **kwargs):
+
+        results = []
+        if not self._authorised():
+            return results
+
+        items = {'Cache': [], 'Season': [], 'Episode': [], 'Propers': []}
+
+        rc = dict((k, re.compile('(?i)' + v)) for (k, v) in {
+            'info': 'detail', 'get': 'download', 'filter': 'fa-(?:heart|star)'}.items())
+        for mode in search_params.keys():
+            for search_string in search_params[mode]:
+                search_string = isinstance(search_string, unicode) and unidecode(search_string) or search_string
+                search_url = self.urls['search'] % (search_string, self._categories_string(mode, 'cats2[]=%s'))
+
+                html = self.get_url(search_url, timeout=90)
+
+                cnt = len(items[mode])
+                try:
+                    if not html or self._has_no_results(html):
+                        raise generic.HaltParseException
+
+                    with BS4Parser(html, features=['html5lib', 'permissive']) as soup:
+                        torrent_table = soup.find('table', class_='yenitorrenttable')
+                        torrent_rows = [] if not torrent_table else torrent_table.find_all('tr')
+
+                        if 2 > len(torrent_rows):
+                            raise generic.HaltParseException
+
+                        head = None
+                        for tr in torrent_rows[1:]:
+                            cells = tr.find_all('td')
+                            if 5 > len(cells):
+                                continue
+                            try:
+                                head = head if None is not head else self._header_row(
+                                    tr, custom_tags=[('span', 'data-original-title')])
+                                seeders, leechers, size = [n for n in [
+                                    cells[head[x]].get_text().strip() for x in 'seed', 'leech', 'size']]
+                                if (self.freeleech and not tr.find('i', class_=rc['filter'])) \
+                                        or self._peers_fail(mode, seeders, leechers):
+                                    continue
+
+                                title = tr.find('a', href=rc['info']).get_text().strip()
+                                download_url = self._link(tr.find('a', href=rc['get'])['href'])
+                            except (AttributeError, TypeError, ValueError, KeyError):
+                                continue
+
+                            if title and download_url:
+                                items[mode].append((title, download_url, seeders, self._bytesizer(size)))
+
+                except generic.HaltParseException:
+                    pass
+                except (StandardError, Exception):
+                    logger.log(u'Failed to parse. Traceback: %s' % traceback.format_exc(), logger.ERROR)
+
+                self._log_search(mode, len(items[mode]) - cnt, search_url)
+
+            results = self._sort_seeding(mode, results + items[mode])
+
+        return results
+
+    def _season_strings(self, ep_obj, **kwargs):
+
+        return self._search_params(generic.TorrentProvider._season_strings(self, ep_obj, **kwargs))
+
+    def _episode_strings(self, ep_obj, **kwargs):
+
+        return self._search_params(generic.TorrentProvider._episode_strings(self, ep_obj, **kwargs))
+
+    @staticmethod
+    def _search_params(search_params):
+
+        return [dict((k, ['*%s*' % re.sub('[.\s]', '*', v) for v in v]) for k, v in d.items()) for d in search_params]
+
+    @staticmethod
+    def ui_string(key):
+
+        return 'wop_digest' == key and 'use... \'uid=xx; pass=yy; hashv=zz\'' or ''
+
+
+provider = WOPProvider()