diff --git a/dev-scheme/chezscheme/chezscheme-9.5.4.ebuild b/dev-scheme/chezscheme/chezscheme-9.5.4.ebuild
index 6a2d56b..19d1e82 100644
--- a/dev-scheme/chezscheme/chezscheme-9.5.4.ebuild
+++ b/dev-scheme/chezscheme/chezscheme-9.5.4.ebuild
@@ -1,13 +1,15 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools wrapper
+CSV="csv${PV}"
+
+inherit autotools multilib wrapper
 
 DESCRIPTION="Open-source Chez Scheme implementation from Cisco"
 HOMEPAGE="https://cisco.github.io/ChezScheme/"
-SRC_URI="https://github.com/cisco/ChezScheme/releases/download/v${PV}/csv${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/cisco/ChezScheme/releases/download/v${PV}/${CSV}.tar.gz -> ${P}.tar.gz"
 
 RESTRICT="mirror test"
 LICENSE="Apache-2.0"
@@ -16,18 +18,18 @@ KEYWORDS="~amd64"
 IUSE="threads"
 
 PATCHES=(
-	"${FILESDIR}"/chezscheme-tinfo.patch
+	"${FILESDIR}/chezscheme-tinfo.patch"
 )
 
-S="${WORKDIR}"/"csv${PV}"
+S="${WORKDIR}/${CSV}"
 
 src_configure() {
 	local myconf=(
 		$(usex threads '--threads' '')
-		--installbin=/usr/bin
-		--installlib=/usr/lib64
-		--installman=/usr/share/man
-		--installprefix=/usr
+		--installbin="/usr/$(get_libdir)/${CSV}"
+		--installlib="/usr/$(get_libdir)"
+		--installman="/usr/share/man"
+		--installprefix="/usr"
 		--temproot="${D}"
 	)
 	sh ./configure "${myconf[@]}"
@@ -36,6 +38,9 @@ src_configure() {
 src_install() {
 	default
 
-	make_wrapper "chez" "${EPREFIX}/usr/bin/scheme"
-	make_wrapper "${PN}" "${EPREFIX}/usr/bin/scheme"
+	local chez_dir="${EPREFIX}/usr/$(get_libdir)/${CSV}"
+	make_wrapper "${PN}" "${chez_dir}/scheme"
+	make_wrapper "chez" "${chez_dir}/scheme"
+	make_wrapper "petite" "${chez_dir}/petite"
+	make_wrapper "scheme-script" "${chez_dir}/scheme-script"
 }