diff --git a/common/shlibs b/common/shlibs
index d73c0309c8c..19d9ca59b61 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2339,3 +2339,4 @@ liblog4cxx.so.10 log4cxx-0.10.0_1
 libsearpc.so.1 libsearpc-3.0.7_1
 libccnet.so.0 ccnet-5.0.4_1
 libseafile.so.0 seafile-libclient-5.0.4_1
+libpodofo.so.0.9.3 podofo-0.9.3_1
diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
new file mode 100644
index 00000000000..33415188b34
--- /dev/null
+++ b/srcpkgs/calibre/template
@@ -0,0 +1,61 @@
+# Template file for 'calibre'
+pkgname=calibre
+version=2.50.1
+revision=1
+build_style=python-module
+hostmakedepends="python pkg-config python-dateutil python-lxml python-Pillow
+python-PyQt5-webkit python-apsw python-cssutils"
+makedepends="python-devel qt5-qmake python-PyQt5-devel glib-devel
+fontconfig-devel libmagick-devel libressl-devel icu-devel sqlite-devel
+libchmlib-devel podofo-devel qt5-devel libusb-devel libmtp-devel
+libinput-devel libxkbcommon-devel"
+depends="python-six python-dateutil python-cssutils python-CherryPy
+python-mechanize podofo libwmf ImageMagick chmlib python-lxml libusb
+python-Pillow shared-mime-info python-dnspython python-PyQt5 python-PyQt5-webkit
+python-psutil icu libmtp python-dbus python-netifaces python-cssselect
+python-apsw qt5-webkit qt5-svg python-chardet python-html5lib python-Pygments
+mtdev desktop-file-utils gtk-update-icon-cache optipng"
+short_desc="Ebook management application"
+make_build_args="build gui"
+maintainer="Andrea Brancaleoni <miwaxe@gmail.com>"
+license="GPL-3"
+homepage="https://calibre-ebook.com"
+nocross=yes
+distfiles="https://download.calibre-ebook.com/${version}/calibre-${version}.tar.xz"
+checksum=a932a07385cd587b80b48a36227c9ed586da83f1a28940285b88c2512477c53b
+
+pycompile_version="2.7"
+pycompile_dirs="/usr/lib/calibre/"
+
+pre_configure() {
+	# Remove unneeded files and libs
+	rm -rf resources/${pkgname}-portable.* \
+		src/cherrypy \
+		src/html5lib \
+		src/chardet
+
+	# Desktop integration (e.g. enforce arch defaults)
+	sed -e "/self.create_uninstaller()/,/os.rmdir(config_dir)/d" \
+		-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
+}
+
+do_build() {
+	python2 setup.py build ${make_build_args}
+}
+
+pre_install() {
+	install -d "${pkgdir}/usr/share/zsh/site-functions" \
+		"${pkgdir}"/usr/share/{applications,desktop-directories,icons/hicolor}
+
+	install -Dm644 resources/calibre-mimetypes.xml \
+		"${pkgdir}/usr/share/mime/packages/calibre-mimetypes.xml"
+}
+
+do_install() {
+	python${pyver} setup.py \
+		install --prefix=/usr --staging-root=${DESTDIR}/usr ${make_install_args}
+}
diff --git a/srcpkgs/podofo-devel b/srcpkgs/podofo-devel
new file mode 120000
index 00000000000..6c77184fc8a
--- /dev/null
+++ b/srcpkgs/podofo-devel
@@ -0,0 +1 @@
+./podofo
\ No newline at end of file
diff --git a/srcpkgs/podofo/template b/srcpkgs/podofo/template
new file mode 100644
index 00000000000..78420df170d
--- /dev/null
+++ b/srcpkgs/podofo/template
@@ -0,0 +1,23 @@
+pkgname="podofo"
+version="0.9.3"
+revision=1
+build_style=cmake
+configure_args="-DPODOFO_BUILD_SHARED=1"
+short_desc="Library to work with the PDF file format"
+maintainer="Luca - <luca.andrea.fuse@gmx.com>"
+license="GPL-2"
+homepage="http://podofo.sourceforge.net/"
+distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
+hostmakedepends="cmake"
+makedepends="freetype-devel fontconfig-devel zlib-devel libpng-devel libjpeg-turbo-devel lua52-devel tiff-devel"
+checksum="ec261e31e89dce45b1a31be61e9c6bb250532e631a02d68ec5bb849ef0a222d8"
+
+podofo-devel_package() {
+	license="LGPL-2"
+	short_desc+=" - development files"
+	depends="podofo-${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/*.so
+	}
+}
diff --git a/srcpkgs/python-CherryPy/template b/srcpkgs/python-CherryPy/template
new file mode 100644
index 00000000000..a2f39145b45
--- /dev/null
+++ b/srcpkgs/python-CherryPy/template
@@ -0,0 +1,20 @@
+# Template file for 'python-cherry'
+_realname=CherryPy
+pkgname=python-${_realname}
+version=4.0.0
+revision=1
+wrksrc="${_realname}-${version}"
+build_style=python-module
+noarch=yes
+hostmakedepends="python"
+pycompile_module="${_realname}"
+short_desc="A pythonic, object-oriented web development framework"
+maintainer="Andrea Brancaleoni <miwaxe@gmail.com>"
+license="BSD"
+homepage="http://www.cherrypy.org"
+distfiles="${PYPI_SITE}/${_realname:0:1}/${_realname}/${_realname}-${version}.tar.gz"
+checksum=73ad4f8870b5a3e9988a7778b5d3003a390d440527ec3458a0c7e58865d2611a
+
+post_install() {
+	vlicense cherrypy/LICENSE.txt
+}