diff --git a/src/calibre/ebooks/epub/from_any.py b/src/calibre/ebooks/epub/from_any.py
index e81821ed53..9a8e251108 100644
--- a/src/calibre/ebooks/epub/from_any.py
+++ b/src/calibre/ebooks/epub/from_any.py
@@ -124,6 +124,7 @@ MAP = {
        'lit'  : lit2opf,
        'mobi' : mobi2opf,
        'prc'  : mobi2opf,
+       'azw'  : mobi2opf,
        'fb2'  : fb22opf,
        'rtf'  : rtf2opf,
        'txt'  : txt2opf,
@@ -131,7 +132,8 @@ MAP = {
        'epub' : epub2opf,
        'odt'  : odt2epub,
        }
-SOURCE_FORMATS = ['lit', 'mobi', 'prc', 'fb2', 'odt', 'rtf', 'txt', 'pdf', 'rar', 'zip', 'oebzip', 'htm', 'html', 'epub']
+SOURCE_FORMATS = ['lit', 'mobi', 'prc', 'azw', 'fb2', 'odt', 'rtf', 
+                  'txt', 'pdf', 'rar', 'zip', 'oebzip', 'htm', 'html', 'epub']
 
 def unarchive(path, tdir):
     extract(path, tdir)
diff --git a/src/calibre/ebooks/lrf/__init__.py b/src/calibre/ebooks/lrf/__init__.py
index 73a261b931..2f9d724ce2 100644
--- a/src/calibre/ebooks/lrf/__init__.py
+++ b/src/calibre/ebooks/lrf/__init__.py
@@ -29,6 +29,7 @@ preferred_source_formats = [
                             'XHTM',
                             'XHTML',
                             'PRC',
+                            'AZW',
                             'RTF',
                             'PDF',
                             'TXT',
diff --git a/src/calibre/ebooks/lrf/any/convert_from.py b/src/calibre/ebooks/lrf/any/convert_from.py
index 002064bced..fdfe1c54d5 100644
--- a/src/calibre/ebooks/lrf/any/convert_from.py
+++ b/src/calibre/ebooks/lrf/any/convert_from.py
@@ -154,7 +154,7 @@ def process_file(path, options, logger=None):
             convertor = txt2lrf
         elif 'epub' == ext:
             convertor = epub2lrf
-        elif ext in ['mobi', 'prc']:
+        elif ext in ['mobi', 'prc', 'azw']:
             convertor = mobi2lrf
         elif ext == 'fb2':
             convertor = fb22lrf