diff --git a/srcpkgs/calibre/files/calibre-viewer.desktop b/srcpkgs/calibre/files/calibre-viewer.desktop
new file mode 100644
index 00000000000..41f7dd58a5d
--- /dev/null
+++ b/srcpkgs/calibre/files/calibre-viewer.desktop
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Application
+Name=Calibre-viewer
+GenericName=E-book viewer
+Comment=E-book viewer
+TryExec=ebook-viewer
+Exec=ebook-viewer
+Icon=/usr/share/calibre/images/viewer.png
+Terminal=false
+StartupNotify=false
+Categories=Application;Office;Viewer
+MimeType=application/x-sony-bbeb;application/epub+zip;text/lrs;application/x-mobipocket-ebook;application/x-topaz-ebook;application/x-kindle-application;application/x-mobipocket-subscription;application/x-mobipocket-subscription-magazine;application/x-mobi8-ebook
diff --git a/srcpkgs/calibre/files/calibre.desktop b/srcpkgs/calibre/files/calibre.desktop
index e174fd6b840..7d6d91a2421 100644
--- a/srcpkgs/calibre/files/calibre.desktop
+++ b/srcpkgs/calibre/files/calibre.desktop
@@ -4,9 +4,10 @@ Type=Application
 Name=Calibre
 Comment=E-book library management
 Comment[de]=E-Book Bibliotheksverwaltung
-Keywords=epub;mobi;ebook
+TryExec=calibre
 Exec=calibre
-Icon=/usr/share/calibre/content_server/calibre.png
+Icon=/usr/share/calibre/images/library.png
 Terminal=false
 StartupNotify=false
 Categories=Application;Office;Viewer
+MimeType=application/x-sony-bbeb;application/epub+zip;text/lrs;application/x-mobipocket-ebook;application/x-topaz-ebook;application/x-kindle-application;application/x-mobipocket-subscription;application/x-mobipocket-subscription-magazine;application/x-mobi8-ebook
diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index c3b2cf60d25..75e45b26d04 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,7 +1,7 @@
 # Template file for 'calibre'
 pkgname=calibre
 version=2.56.0
-revision=2
+revision=3
 hostmakedepends="qt5-qmake python-devel pkg-config
  python-dateutil python-lxml python-Pillow
  python-PyQt5-webkit python-apsw python-cssutils python-CherryPy
@@ -47,6 +47,7 @@ do_build() {
 }
 do_install() {
 	vinstall ${FILESDIR}/calibre.desktop 644 usr/share/applications
+	vinstall ${FILESDIR}/calibre-viewer.desktop 644 usr/share/applications
 	python2 setup.py \
 		install --prefix=/usr --staging-root=${DESTDIR}/usr ${make_install_args}
 }