diff --git a/resources/recipes/an_druma_mor.recipe b/resources/recipes/an_druma_mor.recipe
index 7ddd9a8134..d214cf8025 100644
--- a/resources/recipes/an_druma_mor.recipe
+++ b/resources/recipes/an_druma_mor.recipe
@@ -1,8 +1,8 @@
 from calibre.web.feeds.news import BasicNewsRecipe
 
-class AdvancedUserRecipe1257775999(BasicNewsRecipe):
+class AnDrumaMor(BasicNewsRecipe):
     title          = u'An Druma M\xf3r'
-    __author__ = "David O'Calaghan"
+    __author__ = "David O'Callaghan"
     oldest_article = 7
     max_articles_per_feed = 100
     language = 'ga'
diff --git a/resources/recipes/npr.recipe b/resources/recipes/npr.recipe
new file mode 100644
index 0000000000..167c2125c7
--- /dev/null
+++ b/resources/recipes/npr.recipe
@@ -0,0 +1,19 @@
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class AdvancedUserRecipe1257302745(BasicNewsRecipe):
+    title          = u'National Public Radio'
+    oldest_article = 7
+    language = 'en'
+    __author__ = 'onyxrev'
+    max_articles_per_feed = 100
+
+    remove_tags_before = {'class':'storytitle'}
+    remove_tags_after =  dict(name='div', attrs={'id':'storytext' })
+    remove_tags = [
+                     dict(name='body', attrs={'id':'blog'}),
+                     dict(name='div', attrs={'class':'enlarge_measure'}),
+                     dict(name='div', attrs={'class':'enlarge_html'}),
+                     dict(name='div', attrs={'class':'bucketwrap primary'})
+                  ]
+
+    feeds          = [(u'National Public Radio', u'http://www.npr.org/rss/rss.php?id=1001')]
diff --git a/src/calibre/devices/eb600/driver.py b/src/calibre/devices/eb600/driver.py
index 7d15fe8208..2a55097c14 100644
--- a/src/calibre/devices/eb600/driver.py
+++ b/src/calibre/devices/eb600/driver.py
@@ -88,7 +88,7 @@ class POCKETBOOK360(EB600):
 
     gui_name = 'PocketBook 360'
 
-    FORMATS = ['epub', 'pdf', 'txt']
+    FORMATS = ['epub', 'fb2', 'pdf', 'djvu', 'rtf', 'chm', 'txt']
 
     VENDOR_NAME = 'PHILIPS'
     WINDOWS_MAIN_MEM = 'MASS_STORGE'