diff --git a/src/calibre/linux.py b/src/calibre/linux.py
index edcfa99342..d1927257a7 100644
--- a/src/calibre/linux.py
+++ b/src/calibre/linux.py
@@ -501,6 +501,7 @@ VIEWER = '''\
 Version=%s
 Type=Application
 Name=LRF Viewer
+GenericName=Viewer for LRF files
 Comment=Viewer for LRF files (SONY ebook format files)
 TryExec=lrfviewer
 Exec=lrfviewer %%F
@@ -513,8 +514,9 @@ EVIEWER = '''\
 [Desktop Entry]
 Version=%s
 Type=Application
-Name=Ebook Viewer
-Comment=Viewer for Ebooks
+Name=E-book Viewer
+GenericName=Viewer for E-books
+Comment=Viewer for E-books
 TryExec=ebook-viewer
 Exec=ebook-viewer %%F
 Icon=calibre-viewer
@@ -527,7 +529,8 @@ GUI = '''\
 [Desktop Entry]
 Version=%s
 Type=Application
-Name=calibre - Ebook library management
+Name=calibre
+GenericName=E-book library management
 Comment=E-book library management
 TryExec=calibre
 Exec=calibre