diff --git a/modules/youporn/pages/index.py b/modules/youporn/pages/index.py
index ddc35a2e..ec069711 100644
--- a/modules/youporn/pages/index.py
+++ b/modules/youporn/pages/index.py
@@ -33,7 +33,7 @@ __all__ = ['IndexPage']
 class IndexPage(PornPage):
     def iter_videos(self):
         for li in self.document.getroot().xpath('//ul/li[@class="videoBox"]'):
-            a = li.find('a')
+            a = li.find('div').find('a')
             if a is None or a.find('img') is None:
                 continue
 
@@ -50,7 +50,7 @@ class IndexPage(PornPage):
             video.thumbnail = Thumbnail(unicode(thumbnail_url))
 
             hours = minutes = seconds = 0
-            div = li.cssselect('h2.duration')
+            div = li.cssselect('div.duration')
             if len(div) > 0:
                 pack = [int(s) for s in div[0].text.strip().split(':')]
                 if len(pack) == 3:
@@ -60,9 +60,9 @@ class IndexPage(PornPage):
 
             video.duration = datetime.timedelta(hours=hours, minutes=minutes, seconds=seconds)
 
-            div = li.cssselect('div.rating h2')
+            div = li.cssselect('div.rating')
             if div:
-                video.rating = int(div[0].text.strip('%'))
+                video.rating = int(div[0].text.strip('% '))
                 video.rating_max = 100
 
             video.set_empty_fields(NotAvailable, ('url', 'author'))
diff --git a/modules/youporn/pages/video.py b/modules/youporn/pages/video.py
index e40f6202..c15ec75e 100644
--- a/modules/youporn/pages/video.py
+++ b/modules/youporn/pages/video.py
@@ -84,8 +84,8 @@ class VideoPage(PornPage):
                 else:
                     v.author = unicode(author.text)
             elif name == 'Rating:':
-                r = value.split()
-                v.rating = int(r[0].rstrip('%'))
+                value = li.find('span').text
+                v.rating = int(value.rstrip('%'))
                 v.rating_max = 100
             elif name == 'Date:':
                 v.date = parse_dt(value)