diff --git a/setup/installer/windows/notes.rst b/setup/installer/windows/notes.rst
index 14c8d28df6..ed78bf3158 100644
--- a/setup/installer/windows/notes.rst
+++ b/setup/installer/windows/notes.rst
@@ -21,7 +21,7 @@ This is where all dependencies will be installed.
 
 Add C:\Python27\Scripts and C:\Python27 to PATH 
 
-Edit mimetypes.py in C:\Python27\Lib and change line 250 UnicodeEncodeError to ValueError
+Edit mimetypes.py in C:\Python27\Lib and change line 250 UnicodeEncodeError to ValueError and set _winreg = None to prevent reading of mimetypes from the windows registry
 
 Install setuptools from http://pypi.python.org/pypi/setuptools
 If there are no windows binaries already compiled for the version of python you are using then download the source and run the following command in the folder where the source has been unpacked::
@@ -70,7 +70,11 @@ Compiling instructions::
 Python Imaging Library
 ------------------------
 
-Install as normal using provided installer.
+Install as normal using installer at http://www.lfd.uci.edu/~gohlke/pythonlibs/
+
+Test it on the target system with
+
+calibre-debug -c "import _imaging, _imagingmath, _imagingft, _imagingcms"
 
 Libunrar
 ----------
diff --git a/src/calibre/__init__.py b/src/calibre/__init__.py
index 6e39f56266..688d7793a4 100644
--- a/src/calibre/__init__.py
+++ b/src/calibre/__init__.py
@@ -48,6 +48,13 @@ mimetypes.add_type('application/x-cbz',                   '.cbz')
 mimetypes.add_type('application/x-cbr',                   '.cbr')
 mimetypes.add_type('application/x-koboreader-ebook',      '.kobo')
 mimetypes.add_type('image/wmf',                           '.wmf')
+mimetypes.add_type('image/jpeg',                          '.jpg')
+mimetypes.add_type('image/jpeg',                          '.jpeg')
+mimetypes.add_type('image/png',                           '.png')
+mimetypes.add_type('image/gif',                           '.gif')
+mimetypes.add_type('image/bmp',                           '.bmp')
+mimetypes.add_type('image/svg+xml',                       '.svg')
+
 guess_type = mimetypes.guess_type
 import cssutils
 cssutils.log.setLevel(logging.WARN)