diff -u calibre-2.36.0-1/calibre.install calibre-2.36.0-2/calibre.install
--- calibre-2.36.0-1/calibre.install	2015-08-29 22:05:22.516880283 +0200
+++ calibre-2.36.0-2/calibre.install	2015-08-29 21:51:43.660208713 +0200
@@ -1,6 +1,7 @@
 post_install() {
   update-desktop-database -q
-  update-mime-database usr/share/mime &> /dev/null
+  update-mime-database /usr/share/mime &> /dev/null
+  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
 }
 
 post_upgrade() {
diff -u calibre-2.36.0-1/PKGBUILD calibre-2.36.0-2/PKGBUILD
--- calibre-2.36.0-1/PKGBUILD	2015-08-29 19:51:09.790165382 +0200
+++ calibre-2.36.0-2/PKGBUILD	2015-08-29 22:14:06.533550089 +0200
@@ -8,7 +8,7 @@
 
 pkgname=calibre
 pkgver=2.36.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Ebook management application"
 arch=('i686' 'x86_64')
 url="http://calibre-ebook.com/"
@@ -19,7 +19,8 @@
          'python2-pillow' 'shared-mime-info' 'python2-dnspython'
          'python2-pyqt5' 'python2-psutil' 'icu' 'libmtp' 'python2-dbus'
          'python2-netifaces' 'python2-cssselect' 'python2-apsw' 'qt5-webkit'
-         'qt5-svg' 'python2-chardet' 'python2-html5lib' 'python2-pygments' 'mtdev')
+         'qt5-svg' 'python2-chardet' 'python2-html5lib' 'python2-pygments' 'mtdev'
+         'desktop-file-utils' 'hicolor-icon-theme')
 makedepends=('python2-pycountry' 'qt5-x11extras' )
 optdepends=('ipython2: to use calibre-debug'
             'udisks: required for mounting certain devices'
@@ -44,15 +45,8 @@
 
   # Desktop integration (e.g. enforce arch defaults)
   sed -e "/self.create_uninstaller()/,/os.rmdir(config_dir)/d" \
-      -e "/\(cc('xdg-icon-resource\|self.icon_resources.append\|'128'))\)/d" \
-      -e "/render_img/ s/\('calibre-.*\.png'\)/os.path.join(dir, \1)/g" \
-      -e "/dir, 'calibre-lrf.png'/i \
-\                dir = os.path.join(self.opts.staging_sharedir,'../pixmaps')\n\
-\                os.mkdir(dir)" \
-      -e "/f = open/ s/\('calibre-.*\.desktop'\)/os.path.join(dir, \1)/g" \
-      -e "/dir, 'calibre-lrfviewer.desktop'/i \
-\                dir = os.path.join(self.opts.staging_sharedir,'../applications')\n\
-\                os.mkdir(dir)" \
+      -e "/cc(\['xdg-desktop-menu', 'forceupdate'\])/d" \
+      -e "/cc(\['xdg-mime', 'install', MIME\])/d" \
       -e "s/'ctc-posml'/'text' not in mt and 'pdf' not in mt and 'xhtml'/" \
       -e "s/^Name=calibre/Name=Calibre/g" \
       -i  src/calibre/linux.py
@@ -75,9 +69,17 @@
   sed -i -e "s|(prefix=.*)|(prefix='$pkgdir/usr')|g" setup/install.py
 
   install -d "${pkgdir}/usr/lib/python2.7/site-packages" \
-             "${pkgdir}/usr/share/zsh/site-functions"
+             "${pkgdir}/usr/share/zsh/site-functions" \
+             "${pkgdir}/usr/share/applications" \
+             "${pkgdir}/usr/share/desktop-directories" \
+             "${pkgdir}/usr/share/icons/hicolor" \
+             "${pkgdir}/usr/share/menus" \
+             "${pkgdir}/usr/share/mime/packages"
 
-  LANG='en_US.UTF-8' python2 setup.py install --root="${pkgdir}" --prefix=/usr \
+  install -m644 resources/calibre-mimetypes.xml "${pkgdir}/usr/share/mime/packages"
+
+  LANG='en_US.UTF-8' XDG_DATA_DIRS="${pkgdir}/usr/share" \
+  python2 setup.py install --root="${pkgdir}" --prefix=/usr \
     --staging-bindir="${pkgdir}/usr/bin" \
     --staging-libdir="${pkgdir}/usr/lib" \
     --staging-sharedir="${pkgdir}/usr/share"