diff --git a/app-text/texlive-core/Manifest b/app-text/texlive-core/Manifest
index c07ab7c36d7a5..63bacd8f20111 100644
--- a/app-text/texlive-core/Manifest
+++ b/app-text/texlive-core/Manifest
@@ -541,12 +541,10 @@ DIST texlive-module-texlive.infra-2012.tar.xz 201208 SHA256 5fe00631127b70ce82a7
 DIST texlive-module-texlive.infra-2013.tar.xz 208688 SHA256 4863956f78c100dff87001a4a866c276803bd16f1db7c50a44fa07bc1e87e8ba SHA512 b0155d3a8d47d49680cf70a68862f856730d63f3f1d7b6c556491b3251151b499a646c05253c9c372e0032247543b48743391cb06de268de4a0b9ac56ea0105c WHIRLPOOL a6e26140dbdeb6f7d7639559ad5768293680ff0946e53e1936ba406fecc74352516194cf9f6e5e252fe16bdbe9a92805e8f03524d25c98c97bd4c9f733ac6a1a
 DIST texlive-module-texlive.infra-2014.tar.xz 208212 SHA256 9661472c9e0311daeaff1c6cf0d1d973325ff6332e8a51d9e60821eb45b31546 SHA512 f44336f0ecaa56e00c6cbb6299746315294cea658b3b1a7b0a06c54b17c2698d422eb5727f5da4ebbfc63b4f441eaa87c0cc2023a260efd27edb5bd8d2be645a WHIRLPOOL f0e59fa68d39670afe7ee37307c28368d93276079b60273dcfef6c41e83d69cfa788b75ce43abc75359cc5a051e2aa921f6b99ab7a5f3f512c19f23cb713118d
 DIST texlive-module-texlive.infra-2015.tar.xz 211924 SHA256 c7ff0b9a117a527f9f9426577f768635597b0834fc493601019a6c8667143ea4 SHA512 5e539b43b3360bd5ab828e0f3f5669e17e16fc0656999e6c239a7bd50a78c866b32b670dda1c97b1fd15701a3a31ad7b24df6ba351e75260ea9ad50f83747f0a WHIRLPOOL cc4eb88fcad84bfb147b8cb64f989205751159954abec1b1a80e622addf5c2bc51d9f368666bf70adac437fcf59ab972f26e05d8953ceda8f2e170eaa474bbc3
-DIST texlive-module-texlive.infra-2016.tar.xz 194264 SHA256 25323dbf9d5948611db87e8e0a62fd7517345afe62e62ff82f4659ad3c0b5153 SHA512 583a28fd7a23a68f7a3dee0060d98d60e89e16a32d054604beefd73d1db951ba81e4ae8142fc60deb35bf8ab8b6449a36e99393fe1a5eee086a50b3af431f1c3 WHIRLPOOL 5c0cf9363a4fbd9a41d678ac080a0bc3ad7be16351ef73e26493433830a44266e1f283a4b7d1d898d543a179d87b2288fe03585c17f65a632077d4382f486e07
 DIST texlive-module-texlive.infra.doc-2012.tar.xz 87012 SHA256 a4c83ff198dd01e1fb892367e56e9acd306cc931f1a3163956dba8f32d7dccf8 SHA512 144986792b7f47fcac25a246ac910b0e10f12e827944a4e5f2a005611f2f15e3d295f3ecc41e8722255aa46c1d8fff774614d7440e0f916feec5fa493ff348cf WHIRLPOOL c3e71f58d8e5fd66c4441270bc93ee82f3bac012cd7826efce404e4d523d3c3d217f62d635968db46c9bb91662ce827d32d24c154e8f1f763ac2c2bfda252a47
 DIST texlive-module-texlive.infra.doc-2013.tar.xz 96212 SHA256 15523845f4f107fd568c8f65dd43b04a07e10de67224ae5cc363fa4ca7320d47 SHA512 57d81d60a0c9a4b43199379b284edd758cca674abd1f45cbb6c62aa8af1efc69b34da2a8420343ca9d19d45802bd4215fb97a3af77262baddfa88fd736c1f7ca WHIRLPOOL 2f91c73adf4b4bd502dbc7c16031e3e75d8f27c5d06b8b95a4ec8e11d6c78e210e70f63cee57e8a4c82ff7fa7072255463571479fc0a43ed6f3f59b8c876da00
 DIST texlive-module-texlive.infra.doc-2014.tar.xz 97624 SHA256 244c6911d1aa894427934f1ab56ddae33647a78737619aed71864c46836a797a SHA512 7e51c659b69af5b068147b8839dea86aa0d7ea34592cd6e9a16e3e30fdbb9c10b540bfcbb47edf3cee4cb287fc050d04fb50dd1aefee5e0b76b503658385c55c WHIRLPOOL 397f08f9e036f65321b8ba006dc7814a5367de81f4553bf592d8014aaa33f1134670a7698e776751c97c36f5ca4da11ac0c75b28e36c312f5c49f92e74dff37b
 DIST texlive-module-texlive.infra.doc-2015.tar.xz 96312 SHA256 46e123efc4fbfd4d727d027ae9dc1ccae39f5f7728b220768161d5df58f693de SHA512 5cc285015d819c5f88f0a01beee1fcf145957da2a483005b26034997ca7a5a01a3147b392fb6f7ffe5d8dd0d07a8ad242acfb7bb391d6db0f7038a617916142b WHIRLPOOL 6735d74b9a53c74579e345ce5a9639d3937bdaeb4b89ec2c29cc956e955c3981e4c4c48b3fe09b6828f40b26b4e566fd1df634de9d94a4cb5ed7c49ee83a372d
-DIST texlive-module-texlive.infra.doc-2016.tar.xz 168904 SHA256 3b0382ff68c4bcabf3caddd1dc5596a6916e02ce94929751e1e16cdbf7352fed SHA512 dd7c466ca4c94c81a0b7bd0d3ce5938c82f38c878a5b1e6ea68317f064ceecb43f02616c303265998f92bb486f3eddbbc3d6d16cea8c92a57e01f1591219c710 WHIRLPOOL 7df11fa9f1e2d84185d33570774fb85c4f6b9c8b7ab5ad68c1073f8e19094ddde1b0a6404e26729863a1fa6813239bd7285e9ed7d8a5cd6bca0014584a86e5f5
 DIST texlive-module-texliveonfly-2012.tar.xz 6144 SHA256 81d276b4f7e9a4579ce889a0a4722ffbe1a0b1ced16aa06426acda9c2e73c71f SHA512 a43746ea789f47536e6066ee3bb0e1ac3c06e4cf026c0b0af730e1c6fa4a16fcce251a87f0f06500d85f4c0bccb8269480865b62c28be9c1334e6178d6e03071 WHIRLPOOL 7f99a942a644a18e9184cbaa80738dd9a5d24e2b54c01eb023b5a4bd3b7975bf6f4bfbc51ad15bad5503f21193fb6203174f06d1a360b114f5a8a07633c8636b
 DIST texlive-module-texliveonfly-2013.tar.xz 6144 SHA256 81d276b4f7e9a4579ce889a0a4722ffbe1a0b1ced16aa06426acda9c2e73c71f SHA512 a43746ea789f47536e6066ee3bb0e1ac3c06e4cf026c0b0af730e1c6fa4a16fcce251a87f0f06500d85f4c0bccb8269480865b62c28be9c1334e6178d6e03071 WHIRLPOOL 7f99a942a644a18e9184cbaa80738dd9a5d24e2b54c01eb023b5a4bd3b7975bf6f4bfbc51ad15bad5503f21193fb6203174f06d1a360b114f5a8a07633c8636b
 DIST texlive-module-texliveonfly-2014.tar.xz 6140 SHA256 b2f3e4f35bb26f8aa404ff530a82a2e130c497e441994e0096f2f34eb7ef216f SHA512 6ecd957140aae2bd565646d3a31ee9e14c879707f2eb298886d1e2f844719b1413c8f95ea4659e88a2d5e0910e95781d5009d415ed03f0c8f3fc63c876a6cd79 WHIRLPOOL 62f5e50a3bb539fe36ba809699ae0b4da0758cd8ac97f09d7768f2b0602417c905d2b964bf62de9ea519cb3ec4c211660987974d2890a99c54e411de512ae824
diff --git a/app-text/texlive-core/texlive-core-2016-r2.ebuild b/app-text/texlive-core/texlive-core-2016-r3.ebuild
similarity index 98%
rename from app-text/texlive-core/texlive-core-2016-r2.ebuild
rename to app-text/texlive-core/texlive-core-2016-r3.ebuild
index 14b55de883f74..9151bce62f835 100644
--- a/app-text/texlive-core/texlive-core-2016-r2.ebuild
+++ b/app-text/texlive-core/texlive-core-2016-r3.ebuild
@@ -55,8 +55,8 @@ TL_CORE_BINEXTRA_SRC_MODULES="
 	texdef.source texosquery.source
 "
 
-TL_CORE_EXTRA_MODULES="tetex hyphen-base texconfig gsftopk texlive.infra ${TL_CORE_BINEXTRA_MODULES}"
-TL_CORE_EXTRA_DOC_MODULES="tetex.doc texconfig.doc gsftopk.doc texlive.infra.doc ${TL_CORE_BINEXTRA_DOC_MODULES}"
+TL_CORE_EXTRA_MODULES="tetex hyphen-base texconfig gsftopk ${TL_CORE_BINEXTRA_MODULES}"
+TL_CORE_EXTRA_DOC_MODULES="tetex.doc texconfig.doc gsftopk.doc ${TL_CORE_BINEXTRA_DOC_MODULES}"
 TL_CORE_EXTRA_SRC_MODULES="${TL_CORE_BINEXTRA_SRC_MODULES}"
 
 for i in ${TL_CORE_EXTRA_MODULES}; do