diff --git a/resources/recipes/darknet.recipe b/resources/recipes/darknet.recipe
index 4410e0567f..c256504cf6 100644
--- a/resources/recipes/darknet.recipe
+++ b/resources/recipes/darknet.recipe
@@ -23,7 +23,8 @@ class darknet(BasicNewsRecipe):
 
     remove_tags = [dict(id='navi_top'),
 		   dict(id='navi_bottom'),
-		   dict(id='logo'),
+		   dict(id='nav'),
+		   dict(id='top-ad'),
 		   dict(id='login_suche'),
 		   dict(id='navi_login'),
 		   dict(id='breadcrumb'),
@@ -32,13 +33,14 @@ class darknet(BasicNewsRecipe):
 		   dict(name='span', attrs={'class':'rsaquo'}),
 		   dict(name='span', attrs={'class':'next'}),
 		   dict(name='span', attrs={'class':'prev'}),
+		   dict(name='span', attrs={'class':'comments'}),
 		   dict(name='div', attrs={'class':'news_logo'}),
 		   dict(name='div', attrs={'class':'nextprev'}),
+		   dict(name='div', attrs={'class':'tags'}),
+		   dict(name='div', attrs={'class':'Nav'}),
 		   dict(name='p', attrs={'class':'news_option'}),
 		   dict(name='p', attrs={'class':'news_foren'})]
-    remove_tags_after = [dict(name='div', attrs={'class':'entrybody'})]
+    remove_tags_after = [dict(name='div', attrs={'class':'meta-footer'})]
 
     feeds =  [ ('darknet', 'http://feedproxy.google.com/darknethackers') ]
 
-
-
diff --git a/src/calibre/devices/misc.py b/src/calibre/devices/misc.py
index 9d58bbcae6..c7e0356f32 100644
--- a/src/calibre/devices/misc.py
+++ b/src/calibre/devices/misc.py
@@ -45,7 +45,7 @@ class KOBO(USBMS):
     BCD         = [0x0110]
 
     VENDOR_NAME = 'KOBO_INC'
-    WINDOWS_MAIN_MEM = '.KOBOEREADER'
+    WINDOWS_MAIN_MEM = WINDOWS_CARD_A_MEM = '.KOBOEREADER'
 
     EBOOK_DIR_MAIN = ''
     SUPPORTS_SUB_DIRS = True