diff --git a/app-crypt/oscam/Manifest b/app-crypt/oscam/Manifest
index 9d54e46..222d7f4 100644
--- a/app-crypt/oscam/Manifest
+++ b/app-crypt/oscam/Manifest
@@ -1,6 +1,6 @@
 AUX oscam.confd 56 BLAKE2B ce7446a5b7520ef4b11e403e14b4be8710e00ba8031bceb21634da36d601f2c1e4e7af71c604f064c3288f50cb40ce9f1df56cd1489e483a9995bf654077bb5d SHA512 a8b637c8e88e93cc0f12b73b9bb3bedf8709c316c041cb42aa157e75a48a66bc0edc1704d5296a7f57f4f7a38b3ba4416d7a8034fafd2c29a1c16335633a1d51
 AUX oscam.initd 372 BLAKE2B e11b74fdde6dd0b86d5a7ec7f5043fb885ae9a2306321ee565c8a7b8cc850b857325cffe3f74af8ca0491ec9daf2eb13e07bfecc04e0c1ba3369301e0286f938 SHA512 6b386e04255b422aac39fc0e0ddd683e20ec066fc7b85d4ceeb25f4901c7003e59ba3d62746915987f3be7cfbc52e36fa9aade5449b84b4da56d41adf20cfebe
 AUX oscam.service 245 BLAKE2B c93430b8ce3e798d01bd350cf7a255a42cdb5ded8a9b418b5632d0c6f198acb32bf5fd1af38e80bc97aaea59edd538cc0c3ce48fa214f5d169e6346b2512a09b SHA512 7b9893962793c56dc0f402dbb9938bd81231204bcf430a3e537fc4b3196f67ec86d0f280b16d7b588c95b10c59747cb8e5b72a082148790533bfa4526bbe67e5
-EBUILD oscam-9999.ebuild 6322 BLAKE2B ce00f4e9274abd554a7fe4ebc63546369ef69d867fdc89191f300364f5fcd4bb200eb544524c3a5faab291ad3eb3bf1d40a8ccd9253138519f90c57fa5b07e75 SHA512 7b7797d6cbf9e9baad6727462f5c8d428e437cf00fb1b64e7a8fcc931dc9c2e40fc6b7ab2bedad96a8d3cdfdc9bda0dcf9c70bc61dec9fef39523e401ac588df
+EBUILD oscam-9999.ebuild 6600 BLAKE2B de08271e52d8c8b626614dfcd7be2cafcf9469ffe61d95f7b747cc71162ca575c0b6d47ee12b76a9dc6709998d3ac6faa3ce5446c66f172f70e50449a117e7ab SHA512 9aa5e100219ffb3ed86c5fdaf70345d418d106f131a8d30f281039f8c98544df6516d20347ae4485d231cb1a918f7931532330deca87e23d394fc7b3beea5269
 MISC ChangeLog 290 BLAKE2B 36fb20456d44d71117d2845d45868cab61dd7e309fad1c3622e9895cfb0279827690117a9220a44695031d9637ff07628b9b2ef0d0ba6d84f9dd21f9bc42723b SHA512 e7c4c74bc75e3e08ac360f5ee2451054a314309d80e15029ce13c4b11407963e0721a11185c0dc21f4fe1816dde9355392dd01f4f37d4b2b86a8d9554a61ebe1
 MISC metadata.xml 249 BLAKE2B 81f45d16793b7a445e3aca417c1209366f9025b0285ec8324c8b5b9a3dc5bbe3b84513057f16bcd900d89b9d678d4467631bc1c9978e5c670eaf9c0e8595931d SHA512 62e5924d69c6499ee7b5e6629714ae2f546534016044e1505132b542c96ebc6cfde60c439864389b03a0522eb7e42e21c1e2c577e0d6a1c887b4018e1871a279
diff --git a/app-crypt/oscam/oscam-9999.ebuild b/app-crypt/oscam/oscam-9999.ebuild
index 40dd18f..5b83cca 100644
--- a/app-crypt/oscam/oscam-9999.ebuild
+++ b/app-crypt/oscam/oscam-9999.ebuild
@@ -26,17 +26,17 @@ SLOT="0"
 IUSE="cacheex +debug doc ipv6 +ssl systemd"
 
 IUSE_OSCAM_ADDONS="
-	webif touch dvbapi clockfix irdeto_guess anticasc lb cyclecheck
-	lcd led"
+	anticasc clockfix cyclecheck dvbapi irdeto_guess lb lcd led 
+	touch webif"
 IUSE_OSCAM_CARDREADERS="
-	phoenix internal mp35 sc8in1 smargo db2com stinger drecas
-	pcsc smart"
+	db2com drecas internal mp35 pcsc phoenix sc8in1 smargo
+	smart stapi stapi5 stinger"
 IUSE_OSCAM_MODULES="
-	monitor camd33 camd35 camd35_tcp newcamd cccam cccshare gbox
-	radegast serial constcw pandora ghttp scam"
+	camd33 camd35 camd35_tcp cccam cccshare constcw gbox ghttp
+	monitor newcamd pandora radegast scam serial"
 IUSE_OSCAM_READERS="
-	nagra irdeto conax cryptoworks seca viaccess videoguard dre
-	tongfang bulcrypt griffin dgcrypt"
+	bulcrypt conax cryptoworks dgcrypt dre griffin irdeto nagra
+	nagra_merlin seca tongfang viaccess videoguard"
 
 for addon in ${IUSE_OSCAM_ADDONS}; do
 	IUSE="${IUSE} oscam_addons_${addon}"
@@ -65,7 +65,7 @@ src_configure() {
 	my_options=""
 
 	# Generic options
-	use cacheex && my_options="${my_options} CS_CACHEEX"
+	use cacheex && my_options="${my_options} CS_CACHEEX CS_CACHEEX_AIO"
 	use debug && my_options="${my_options} WITH_DEBUG"
 	use ipv6 && my_options="${my_options} IPV6SUPPORT"
 	use ssl && my_options="${my_options} WITH_SSL"
@@ -105,6 +105,8 @@ src_configure() {
 	use oscam_cardreaders_sc8in1 && my_options="${my_options} CARDREADER_SC8IN1"
 	use oscam_cardreaders_smargo && my_options="${my_options} CARDREADER_SMARGO"
 	use oscam_cardreaders_db2com && my_options="${my_options} CARDREADER_DB2COM"
+	use oscam_cardreaders_stapi && my_options="${my_options} CARDREADER_STAPI"
+	use oscam_cardreaders_stapi5 && my_options="${my_options} CARDREADER_STAPI5"
 	use oscam_cardreaders_stinger && my_options="${my_options} CARDREADER_STINGER"
 	use oscam_cardreaders_drecas && my_options="${my_options} CARDREADER_DRECAS"
 	# Smart and PCSC are detected automatically
@@ -113,6 +115,7 @@ src_configure() {
 
 	# Readers
 	use oscam_readers_nagra && my_options="${my_options} READER_NAGRA"
+	use oscam_readers_nagra_merlin && my_options="${my_options} READER_NAGRA_MERLIN"
 	use oscam_readers_irdeto && my_options="${my_options} READER_IRDETO"
 	use oscam_readers_conax && my_options="${my_options} READER_CONAX"
 	use oscam_readers_cryptoworks && my_options="${my_options} READER_CRYPTOWORKS"