diff --git a/net-print/cndrvcups-sfp/Manifest b/net-print/cndrvcups-sfp/Manifest
index c4bb129..99779f1 100644
--- a/net-print/cndrvcups-sfp/Manifest
+++ b/net-print/cndrvcups-sfp/Manifest
@@ -1,4 +1,4 @@
 AUX remove-StatusMonitor.patch 249 BLAKE2B b36889d01f1232987add0e495c147cbd8b9c3515f38935cfc3ce5047a9773cd2673c5348a58169d32592add4b36f7f10f577037482e78c35683a77b66d4ea8ba SHA512 ed6cc24512173635ec7737ff12bbd6f2e5715e38ba72312d31ea22e1419dc7ef9270f7f6f26c28f0587fd9217de126e02a4a31377010d70a00d60b2e0e94b80d
 DIST linux-UFRIILT-drv-v140_uken.tar.gz 106958045 BLAKE2B 605663beea4737a3d7503340d66106a959167fc60ee8f0bfea514ee320c73ce5488290b2a105d72d0f8257d131656c5cd92f7f025297cb2526a2cf28e1066d3f SHA512 3d25db05dd17a85c299bb1fdab776225be5370e6f1f634496a8b4f7dfd59b7a545bccfeb436656387343238e96d624556448047659968fe8094148937ba04e84
-EBUILD cndrvcups-sfp-1.40.ebuild 3278 BLAKE2B 62f0367d67aa8134a69e0a0a89c07c2934936d7fa4b76021012cd2c4d6e3c944d606935d97e3a7b0168396adf825e0013d8718dd698aa9bd7cfe6cd9ff8451b2 SHA512 99ae4cdd47213dbf7a1b2dfc28dfddf3b4d37a0cec3bee1e45da52365e20204861e406da57931e8533b88aa098688d39649e6b3e2fa270e52c8d95b0206b9f54
+EBUILD cndrvcups-sfp-1.40.ebuild 4271 BLAKE2B a57df12314d1ac4cd4d35df3d9ee8998a995189b74a9a8d7ee1abfbf7026641e6229694b81a0001e3b1e6753244022e65f8453edc2725177a2da91e572e7d897 SHA512 d01b3eb87604cbe1a14adf649492bc4412020b3a7e6c8b08c4a01e131499da8d4c7466ceae3eb4dbb6bb032d3b631a369996d80a92bd61cb089e79539dd86124
 MISC metadata.xml 239 BLAKE2B 33a4b7a2007252ef09e319431769f16c7010fc511e2e2ff02853ce5bf064f90b3e3ff088d97510fa0cfdd2dffaf82872f836aff8385efcee22a62d611cc41a21 SHA512 e2741d7308653b7fb13bf9b4af86c5525cea22e23e31925db40ef76a3f228ac5fe520bbf6a0c5b83565e2257e588acaa9a33cc55480138932446642cbbf15623
diff --git a/net-print/cndrvcups-sfp/cndrvcups-sfp-1.40.ebuild b/net-print/cndrvcups-sfp/cndrvcups-sfp-1.40.ebuild
index 98ccc17..38f203c 100644
--- a/net-print/cndrvcups-sfp/cndrvcups-sfp-1.40.ebuild
+++ b/net-print/cndrvcups-sfp/cndrvcups-sfp-1.40.ebuild
@@ -107,12 +107,39 @@ src_install() {
 	dolib.so libcnncapcm.so.1.0
 	dosym libcnncapcm.so.1.0 "/usr/$(get_libdir)/libcnncapcm.so.1"
 	dosym libcnncapcm.so.1.0 "/usr/$(get_libdir)/libcnncapcm.so"
+	for lib in libcnncapcm*.so.?.? libncapfilter.so.?.?.? libcanonncap.so.?.?.?; do
+		dolib.so "${lib}"
+		dosym "${lib}" "/usr/$(get_libdir)/${lib%.?.?}"
+		dosym "${lib}" "/usr/$(get_libdir)/${lib%.?.?.?}"
+	done
+
+	cd "${S}/libs64" || die
 	for lib in *.so.?.?.?; do
 		dolib.so "${lib}"
 		dosym "${lib}" "/usr/$(get_libdir)/${lib%.?.?}"
 		dosym "${lib}" "/usr/$(get_libdir)/${lib%.?.?.?}"
 	done
 
+	use x86 && libsource=libs
+	use amd64 && libsource=libs64
+	cd "${S}/${libsource}" || die
+	insinto /usr/lib/Canon/CUPS_SFP/Bins
+	dobin commandfilefilter
+	insinto /usr/lib/Canon/CUPS_SFP/Utilities
+	dobin pksmncap
+	insinto /usr/lib/Canon/CUPS_SFP/Bidi
+	for lib in libcomm_*.so.?.?.? libccpd_util.so.?.?.? libcaio_usb_cdc.so.?.?.?; do
+		dolib.so "${lib}"
+		dosym "${lib}" "/usr/$(get_libdir)/${lib%.?.?}"
+		dosym "${lib}" "/usr/$(get_libdir)/${lib%.?.?.?}"
+	done
+	insinto /usr/lib/Canon/CUPS_SFP/Libs
+	for lib in libEno*.so.?.?.? libCUPS_Communicator.so.?.?.? libCommIsolation.so.?.?.? libcanon_common.so.?.?.? libinfo*.so.?.?.?; do
+		dolib.so "${lib}"
+		dosym "${lib}" "/usr/$(get_libdir)/${lib%.?.?}"
+		dosym "${lib}" "/usr/$(get_libdir)/${lib%.?.?.?}"
+	done
+
 	# c3pldrv dlopens the absolute path /usr/lib/libcnncapcm.so :(
 	if [[ "$(get_libdir)" != lib ]]; then
 		dosym "../$(get_libdir)/libcnncapcm.so" /usr/lib/libcnncapcm.so