diff --git a/app-office/auto-multiple-choice/Manifest b/app-office/auto-multiple-choice/Manifest
index 557dd1e..cd21cf1 100644
--- a/app-office/auto-multiple-choice/Manifest
+++ b/app-office/auto-multiple-choice/Manifest
@@ -1,10 +1,11 @@
 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
 DIST auto-multiple-choice_1.3.0_sources.tar.gz 4328255 SHA256 682e8a3530f5948b6e3d42b1c54ab4f0449f815dd80947a3f8528a7143a42c0a SHA512 fcfacd071072f5773556c706b6fa0aea4ff3f3752f3a1f40c9e6de7ec870e939adc57e6bd4c90cac80241cc798e02a71c9fc80d9ccf25ad3a10752f937d06da5 WHIRLPOOL 6a7f22565a2d5515ef19355d426af13b664921b3efe94bad0e347c3c0fb7413d09ba9c501eaa215fd9fc148a41ebdc26bd6472cccd935ba796a3d40060ce4315
 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-1.2.1-r3.ebuild 2281 SHA256 015f17f04820aabaac6ce113520b46bc770e23b68ca7464f0235f96bf24136c2 SHA512 9a374196d20cf1bfbe50f4bfaf4875989903ede3985d0470d28923a0042faa64ebd0a86a11d87ba0d5079888de67bf23e1e62f72f2918595c8a3844c7708854c WHIRLPOOL 52a4d4f783db56808632632ded0f756fec0f2450b51292f3374e7a667cb5825a877b0cbaf64ea08c7059342049e536c72b3c7967315eea82bd5e33f786fe8977
 EBUILD auto-multiple-choice-1.3.0-r1.ebuild 2437 SHA256 12112e24065526626e7a1da50a3048d0acbfef97ff45596eb683727b6fe123b7 SHA512 d4cc70ec64575648155fe2155e19f9d33b27b7e5830be31e3b41dbec28a71035a4017663a5add5418743a322834a0b5eb062cae8c659d3a7263864bd507ebc54 WHIRLPOOL e1a352e7c71cb89bf4fe16e828129d1884a261f0d5d3ffc67837e8aca95854a168f68e0c6697d09d2e7dd2386fdfcbab6c3c129bf8200b7d6baed8c385db5d31
+EBUILD auto-multiple-choice-1.3.0-r2.ebuild 2432 SHA256 7bfb0f834386b9d6dd9148812351393a9e776ce124af5ad7509e3bc265c04d26 SHA512 106e77bf62fa668f37dd813305c71174c2f694bb8c15ddd5906fd1aac9a3aff95fa3cc5e2b7169188e32822bd6bad4ee43616d764fe8a2b78d0d6c89f23f183c WHIRLPOOL 018be1bdbc544bb7a8d1124713fccff265e0b0466e657902459fe3aee9124faf9ff41c471ea7e10cbb3ee267c0662a07531994e196a011e229dfa08f97caae3c
 EBUILD auto-multiple-choice-1.3.0.ebuild 2420 SHA256 bd3e527993fcd29da77143ce2347bde9fa1cb760c4c637c6c213ff019872d769 SHA512 ffe5d7e3a41a1f71bee7484bd7747589348ed224d8810b5e2350fd0bf3b281e5f2ccdb282d9a3848cf0639264c84f52859cb3147a5672c3841e3b597de9c6ced WHIRLPOOL 02e5e3a6b4facd57ee4438cf844a4e609f1f4e73a60ec54785163fd334c4dd2accb2836431bd12d0cbdc445a100edadf37e56155fa25d189564a2241803db90a
 EBUILD auto-multiple-choice-9999.ebuild 2346 SHA256 575918daccb4226bba0f896b364bfe14058f48a6237d3b2852df3ecbdcb53673 SHA512 ea9bd91448e6fb6baac92485a7b07e69d8e0a560ee92475bd63bd67c0751cf041eefda938f4747fb4013e3c4166b80d375a08bf3a37c80d6c0367fe2585bfd2e WHIRLPOOL f8e6b977b3cc283d4d83ee992531fef06c422252c1f4c77db81e017bde0364a3bccb3f0fe8c7393196f8107bae4b70f4e20402ae0c0bd7b551851b4c5a92aa17
diff --git a/app-office/auto-multiple-choice/auto-multiple-choice-1.3.0-r2.ebuild b/app-office/auto-multiple-choice/auto-multiple-choice-1.3.0-r2.ebuild
new file mode 100644
index 0000000..199f359
--- /dev/null
+++ b/app-office/auto-multiple-choice/auto-multiple-choice-1.3.0-r2.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils toolchain-funcs
+
+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"
+
+DEPEND="virtual/tex-base
+		virtual/latex-base
+		media-fonts/dejavu
+		media-fonts/ipaex
+		app-text/texlive[cjk,dvi2tty,extra,graphics,png,pstricks,science,truetype,xml,X,luatex,xetex,humanities,omega,publishers]
+		app-text/poppler[cairo]
+		media-libs/netpbm
+		app-text/dblatex
+		app-text/docbook-xml-simple-dtd
+		app-text/docbook-xsl-stylesheets
+		media-libs/opencv
+		app-text/pdftk"
+
+RDEPEND="${DEPEND}
+		>=dev-lang/perl-5
+		dev-perl/Gtk2
+		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
+
+	# Patch Makefile.conf with a valid local TEXDIR (for texlive-2014)
+	sed -i s?'^TEXDIR=.*$'?'TEXDIR=/usr/share/texmf-site/tex/latex/AMC'?g Makefile.conf
+
+	# Patch doc/Makefile with proper TEXINPUTS
+	sed -i s~'export TEXINPUTS=./img_pdf/:'~'export TEXINPUTS=./img_pdf/:./sty/:$(TEXINPUTS):'~ doc/Makefile
+
+	#emake version_files
+}
+
+src_compile() {
+	export TEXINPUTS=".:/usr/share/dblatex/latex/style/:/usr/share/dblatex/latex/misc/:/usr/share/dblatex/latex/graphics/:./sty/:$TEXINPUTS"
+	emake -j1 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'
+}