diff --git a/dev-util/shellspec/shellspec-0.28.1.ebuild b/dev-util/shellspec/shellspec-0.28.1-r1.ebuild
similarity index 82%
rename from dev-util/shellspec/shellspec-0.28.1.ebuild
rename to dev-util/shellspec/shellspec-0.28.1-r1.ebuild
index aeeb16f9ff..8cab3a2a45 100644
--- a/dev-util/shellspec/shellspec-0.28.1.ebuild
+++ b/dev-util/shellspec/shellspec-0.28.1-r1.ebuild
@@ -14,12 +14,12 @@ else
 	KEYWORDS="~amd64"
 fi
 
-LICENSE="MIT-with-advertising"
+LICENSE="MIT"
 SLOT="0"
 IUSE="doc examples test"
-RESTRICT="binchecks strip !test? ( test )"
+RESTRICT="!test? ( test )"
 
-DEPEND="
+RDEPEND="
 	|| (
 		>=app-shells/bash-2.03
 		>=app-shells/dash-0.5.4
@@ -33,8 +33,7 @@ DEPEND="
 	)
 "
 
-BDEPEND="test? ( ${DEPEND} )"
-RDEPEND="${DEPEND}"
+BDEPEND="test? ( ${RDEPEND} )"
 
 DOCS=(
 	CHANGELOG.md
@@ -44,6 +43,8 @@ DOCS=(
 
 src_prepare() {
 	default
+
+	sed -i "s/lib/$(get_libdir)/" stub/shellspec || die
 	sed -i "s/LICENSE//g" Makefile || die
 }
 
@@ -59,5 +60,5 @@ src_install() {
 	use doc && dodoc -r docs
 	use examples && dodoc -r examples
 
-	emake PREFIX="${ED}/usr" install
+	emake LIBDIR="${ED}/usr/$(get_libdir)" PREFIX="${ED}/usr" install
 }
diff --git a/dev-util/shellspec/shellspec-9999.ebuild b/dev-util/shellspec/shellspec-9999.ebuild
index aeeb16f9ff..8cab3a2a45 100644
--- a/dev-util/shellspec/shellspec-9999.ebuild
+++ b/dev-util/shellspec/shellspec-9999.ebuild
@@ -14,12 +14,12 @@ else
 	KEYWORDS="~amd64"
 fi
 
-LICENSE="MIT-with-advertising"
+LICENSE="MIT"
 SLOT="0"
 IUSE="doc examples test"
-RESTRICT="binchecks strip !test? ( test )"
+RESTRICT="!test? ( test )"
 
-DEPEND="
+RDEPEND="
 	|| (
 		>=app-shells/bash-2.03
 		>=app-shells/dash-0.5.4
@@ -33,8 +33,7 @@ DEPEND="
 	)
 "
 
-BDEPEND="test? ( ${DEPEND} )"
-RDEPEND="${DEPEND}"
+BDEPEND="test? ( ${RDEPEND} )"
 
 DOCS=(
 	CHANGELOG.md
@@ -44,6 +43,8 @@ DOCS=(
 
 src_prepare() {
 	default
+
+	sed -i "s/lib/$(get_libdir)/" stub/shellspec || die
 	sed -i "s/LICENSE//g" Makefile || die
 }
 
@@ -59,5 +60,5 @@ src_install() {
 	use doc && dodoc -r docs
 	use examples && dodoc -r examples
 
-	emake PREFIX="${ED}/usr" install
+	emake LIBDIR="${ED}/usr/$(get_libdir)" PREFIX="${ED}/usr" install
 }