diff --git a/src/calibre/library/server/browse.py b/src/calibre/library/server/browse.py
index 576f8801da..e315bb6f3e 100644
--- a/src/calibre/library/server/browse.py
+++ b/src/calibre/library/server/browse.py
@@ -239,6 +239,8 @@ class BrowseServer(object):
                 self.browse_details)
         connect('browse_book', base_href+'/book/{id}',
                 self.browse_book)
+        connect('browse_random', base_href+'/random',
+                self.browse_random)
         connect('browse_category_icon', base_href+'/icon/{name}',
                 self.browse_icon)
 
@@ -351,6 +353,7 @@ class BrowseServer(object):
         cats = [
                 (_('Newest'), 'newest', 'forward.png'),
                 (_('All books'), 'allbooks', 'book.png'),
+                (_('Random book'), 'randombook', 'random.png'),
                 ]
 
         def getter(x):
@@ -599,6 +602,9 @@ class BrowseServer(object):
         elif category == 'allbooks':
             raise cherrypy.InternalRedirect(prefix +
                     '/browse/matches/allbooks/dummy')
+        elif category == 'randombook':
+            raise cherrypy.InternalRedirect(prefix +
+                    '/browse/random')
         else:
             ans = self.browse_category(category, category_sort)
 
@@ -885,6 +891,13 @@ class BrowseServer(object):
 
         return json.dumps(ans, ensure_ascii=False)
 
+    @Endpoint()
+    def browse_random(self, *args, **kwargs):
+        import random
+        book_id = random.choice(tuple(self.db.all_ids()))
+        ans = self.browse_render_details(book_id)
+        return self.browse_template('').format(
+                title='', script='book();', main=ans)
 
     @Endpoint()
     def browse_book(self, id=None, category_sort=None):