diff --git a/manual/conversion.rst b/manual/conversion.rst
index f58ff1952b..22acb1fd98 100644
--- a/manual/conversion.rst
+++ b/manual/conversion.rst
@@ -671,9 +671,8 @@ produce clean HTML that will convert well. Note that Word produces really messy
 HTML, converting it can take a long time, so be patient. If you have a newer
 version of Word available, you can directly save it as .docx as well.
 
-Another alternative is to use the free OpenOffice. Open your .doc file in
-OpenOffice and save it in OpenOffice's format .odt. calibre can directly convert
-.odt files.
+Another alternative is to use the free LibreOffice. Open your .doc file in
+LibreOffice and save it as .docx, which can be directly converted in calibre.
 
 Convert TXT documents
 ~~~~~~~~~~~~~~~~~~~~~~
diff --git a/src/calibre/ebooks/conversion/plugins/odt_input.py b/src/calibre/ebooks/conversion/plugins/odt_input.py
index baa5634e0f..9be76c9b75 100644
--- a/src/calibre/ebooks/conversion/plugins/odt_input.py
+++ b/src/calibre/ebooks/conversion/plugins/odt_input.py
@@ -13,7 +13,7 @@ class ODTInput(InputFormatPlugin):
 
     name        = 'ODT Input'
     author      = 'Kovid Goyal'
-    description = _('Convert ODT (OpenOffice) files to HTML')
+    description = _('Convert ODT (LibreOffice) files to HTML')
     file_types  = {'odt'}
     commit_name = 'odt_input'
 
diff --git a/src/calibre/ebooks/conversion/plugins/rtf_input.py b/src/calibre/ebooks/conversion/plugins/rtf_input.py
index e4e15b2a80..d5cee0178a 100644
--- a/src/calibre/ebooks/conversion/plugins/rtf_input.py
+++ b/src/calibre/ebooks/conversion/plugins/rtf_input.py
@@ -169,7 +169,7 @@ class RTFInput(InputFormatPlugin):
         from calibre.ebooks.covers import message_image
         if self.default_img is None:
             self.default_img = message_image('Conversion of WMF images is not supported.'
-            ' Use Microsoft Word or OpenOffice to save this RTF file'
+            ' Use Microsoft Word or LibreOffice to save this RTF file'
             ' as HTML and convert that in calibre.')
         name = name.replace('.wmf', '.jpg')
         with lopen(name, 'wb') as f: