diff --git a/app-office/auto-multiple-choice/Manifest b/app-office/auto-multiple-choice/Manifest
index 77eed5e..c7e264f 100644
--- a/app-office/auto-multiple-choice/Manifest
+++ b/app-office/auto-multiple-choice/Manifest
@@ -1,5 +1,6 @@
 AUX auto-multiple-choice-1.2-desktop.patch 633 SHA256 83eef1941da9b02617fc3d0d92051df4c1afcd087d17df02531179300690af6b SHA512 26d59593d8267788a25457e203a50c2ed647aae5a12f6f7fd5f3c14c58993141494b38c961dac60ea8779f8bfb4a1a18d21e1556a4c130dd85437ebf70866cb8 WHIRLPOOL efd6a43c6194205411faada979e26333ee1c92ac2a818f88857f336b9e9f21be893f67a581a0b04f564f806b0e19df976c94275ffa613642e4fc78499d0f5e01
 AUX auto-multiple-choice-1.2-makefiles.patch 1405 SHA256 85c56d1abd7422f816a628ca87a493341694abea365c4502c267cc22c0997c96 SHA512 c148cdf737c155b8f91ee358a40abd7a03c7b4717984c13ccd7e6859f4cc39e109a6ea03ba79ba49264ecc59e0401352ed5f66c177967cbaca6036f2b81817f6 WHIRLPOOL 3892c9cac03d43ad8c8325c6f0ef2725a5696179578321a313ed48efd482b0ec2f903b764891440e6a11ffd6a15c073266ffc15ee97a7035ac8cc9e8725aace7
 DIST auto-multiple-choice_1.2.1_sources.tar.gz 3236216 SHA256 0f0f8626d93a3a4ae417ea1ec96937fd6bb6dfdd7857fba72f4106113b5bef4d SHA512 b673525f1326d8e2c80280e88fe9215025c6a3a3951fc0c552eeec2aa22cb682e87752991b5c9373a428d0dc20ba9eeadee1e669c8d85b28af69c331cf4b8439 WHIRLPOOL a7ee28784839d8fb10f76b554f8e4a89d8d9473ff3f7a25013bd6ab96c1b5fdcb7ce252a89042b15d9cb563a2e13f8bb94a30afafeb8b8f2d6ab3be161f3ec69
 EBUILD auto-multiple-choice-1.2.1-r1.ebuild 1953 SHA256 96e7c332d31b1907a498a91147881e9f594f7960a9efd2cb2ce9fa773744eab6 SHA512 23fa264ac5c138b4d33bb9ed5dc5d360b7842f143912a6090faadc699e5cdb38bdbf40b4ae991ff0af0c3260089d13849825b9ef3f997f5e02ececb5b179265b WHIRLPOOL c09baa1405d5e82bb795884fd48b7f18f389a1fe27ed54af7491c51dcef00ccf7819b9763cf28b35fe231b6d882e793f7f85c7a063b4d149aafb77ce8f0de5c7
 EBUILD auto-multiple-choice-1.2.1-r2.ebuild 1975 SHA256 b1d79060b8c81bb2ad64fb9002550cd0960a599681d994f7731748a94d224526 SHA512 3a4c655e8b10a6fc8dbad3e4b982f265287e3dca6ba39d340f57033aaf02497617a924fed1236dcf39cf83090188b5b4b79197a5d1e692d03af5efae33e5ba32 WHIRLPOOL f64184c5674b3cba91d39231659999f284cbb3210cf1b980a439eae6accff47017f0de670a29125f01f392310aa5186016c4399c1f37abbe7e15d791f0ab1d84
+EBUILD auto-multiple-choice-9999.ebuild 2155 SHA256 26c09e0a9b8c4c15b5c25becb2ff6cec7bf844868afaf1793db1d8da28a7b74c SHA512 9f741db8523c6f88bfaf4205d26bf70493d06ccc05be683748814ad8019b72ffe75a25c06985005166d5439466af836b7e1bce8459381cbc775afda543b89f8a WHIRLPOOL bcfecc643419ab0ee6f0f6fe293effd9d8847befb0c83d38cb70125d19a73246ad9ea9fe651cc2acd51b5ed6e11f37d130f0d9f9bcd22453a587e6a329c2af66
diff --git a/app-office/auto-multiple-choice/auto-multiple-choice-9999.ebuild b/app-office/auto-multiple-choice/auto-multiple-choice-9999.ebuild
index d874fc7..d563e1d 100644
--- a/app-office/auto-multiple-choice/auto-multiple-choice-9999.ebuild
+++ b/app-office/auto-multiple-choice/auto-multiple-choice-9999.ebuild
@@ -1,75 +1,78 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI="5"
 
 inherit eutils toolchain-funcs mercurial
 
 SLOT="0"
 
 DESCRIPTION="Create and manage multiple choice questionnaries (MCQ), including automated marking."
 HOMEPAGE="http://project.auto-multiple-choice.net/projects/auto-multiple-choice/"
 #SRC_URI="http://download.gna.org/auto-qcm/${PN}_${PV}_sources.tar.gz"
 LICENSE="GPL-2+"
 KEYWORDS="~x86 ~amd64"
 IUSE="msmtp"
 
 EHG_REPO_URI="https://bitbucket.org/auto-multiple-choice/auto-multiple-choice"
 EHG_REVISION="default"
 
 DEPEND="virtual/tex-base
 		virtual/latex-base
 		app-text/texlive[doc,dvi2tty,dvipdfm,extra,graphics,png,pstricks,science,truetype,xml,X,luatex,xetex,humanities,omega,publishers]
-		app-text/poppler
+		app-text/poppler[cairo]
 		media-libs/netpbm
 		app-text/dblatex
 		app-text/docbook-xml-simple-dtd
 		app-text/docbook-xsl-stylesheets
 		media-libs/opencv"
 
 RDEPEND="${DEPEND}
 		>=dev-lang/perl-5
 		dev-perl/gtk2-perl
 		dev-perl/Gtk2-Notify
 		media-gfx/imagemagick
 		dev-perl/XML-Simple
 		dev-perl/XML-Writer
 		dev-perl/Archive-Zip
 		dev-perl/DBI
 		dev-perl/Text-CSV
 		dev-perl/DBD-SQLite
 		dev-perl/Net-CUPS
 		dev-perl/Email-Address
 		dev-perl/Email-MIME
 		dev-perl/Email-Sender
+		dev-perl/Glib-Object-Introspection
 		msmtp? ( mail-mta/msmtp )"
 
 src_prepare() {
 	# Apply patch on desktop file
 	epatch "${FILESDIR}/${PN}-1.2-desktop.patch"
 
 	# Patch Makefile.conf with a valid local PERLDIR
 	PERL_LOCAL_DIR=$(perl -e 'print "$_\n" for @INC' | grep '/local/' | sort | head -n1)
 	sed -i s?'^PERLDIR=.*$'?'PERLDIR='${PERL_LOCAL_DIR}?g Makefile.conf
+
+	emake version_files
 }
 
 src_compile() {
 	export TEXINPUTS=":/usr/share/dblatex/latex/style:/usr/share/dblatex/latex/misc:/usr/share/dblatex/latex/graphics:"
 	emake \
 			GCC_NETPBM="-I/usr/include/netpbm/ -lnetpbm" \
 			GCC="$(tc-getCC)" \
 			GCC_PP="$(tc-getCXX)"	
 }
 
 pkg_postinst()
 {
 	elog "Running 'texhash' to add 'automultiplechoice.sty'."
 	texhash || die 'An error occured while running texhash'
 }
 
 pkg_postrm()
 {
 	elog "Running 'texhash' to remove 'automultiplechoice.sty'."
 	texhash || die 'An error occured while running texhash'
 }