diff --git a/README.md b/README.md
index 4ee209f8..5c63bf56 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,7 @@ Calibre-Web is a web app providing a clean interface for browsing, reading and d
 - Support for public user registration
 - Send eBooks to Kindle devices with the click of a button
 - Sync your Kobo devices through Calibre-Web with your Calibre library
-- Support for reading eBooks directly in the browser (.txt, .epub, .pdf, .cbr, .cbt, .cbz)
+- Support for reading eBooks directly in the browser (.txt, .epub, .pdf, .cbr, .cbt, .cbz, .djvu)
 - Upload new books in many formats, including audio formats (.mp3, .m4a, .m4b)
 - Support for Calibre Custom Columns
 - Ability to hide content based on categories and Custom Column content per user
diff --git a/cps/helper.py b/cps/helper.py
index 8561a95a..340d41ba 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -198,7 +198,7 @@ def check_send_to_kindle(entry):
 # Check if a reader is existing for any of the book formats, if not, return empty list, otherwise return
 # list with supported formats
 def check_read_formats(entry):
-    EXTENSIONS_READER = {'TXT', 'PDF', 'EPUB', 'CBZ', 'CBT', 'CBR'}
+    EXTENSIONS_READER = {'TXT', 'PDF', 'EPUB', 'CBZ', 'CBT', 'CBR', 'DJVU'}
     bookformats = list()
     if len(entry.data):
         for ele in iter(entry.data):
diff --git a/cps/static/js/libs/djvu_html5/Djvu_html5.html b/cps/templates/readdjvu.html
similarity index 71%
rename from cps/static/js/libs/djvu_html5/Djvu_html5.html
rename to cps/templates/readdjvu.html
index 34886649..c192ffcb 100644
--- a/cps/static/js/libs/djvu_html5/Djvu_html5.html
+++ b/cps/templates/readdjvu.html
@@ -5,12 +5,12 @@
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
 
-<link type="text/css" rel="stylesheet" href="Djvu_html5.css">
+<link type="text/css" rel="stylesheet" href="{{ url_for('static', filename='js/libs/djvu_html5/Djvu_html5.css') }}">
 
 <title>Djvu HTML5 browser demo</title>
 
 <script type="text/javascript" language="javascript"
-	src="djvu_html5/djvu_html5.nocache.js"></script>
+	src="{{ url_for('static', filename='js/libs/djvu_html5/djvu_html5/djvu_html5.nocache.js') }}"></script>
 </head>
 
 <body>
@@ -23,7 +23,7 @@
 			application to display correctly.</div>
 	</noscript>
 
-	<div id="djvuContainer" file="sample/DjVu_Tech_Primer.djvu"></div>
+	<div id="djvuContainer" file="{{ url_for('web.serve_book', book_id=djvufile,book_format='djvu') }}"></div>
 	<script type="text/javascript">
 	var DJVU_CONTEXT = {
 			background: "#666",
diff --git a/cps/web.py b/cps/web.py
index a5844f69..cdcff592 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -1843,6 +1843,9 @@ def read_book(book_id, book_format):
     elif book_format.lower() == "txt":
         log.debug(u"Start txt reader for %d", book_id)
         return render_title_template('readtxt.html', txtfile=book_id, title=_(u"Read a Book"))
+    elif book_format.lower() == "djvu":
+        log.debug(u"Start djvu reader for %d", book_id)
+        return render_title_template('readdjvu.html', djvufile=book_id, title=_(u"Read a Book"))
     else:
         for fileExt in constants.EXTENSIONS_AUDIO:
             if book_format.lower() == fileExt:
