-

diff --git a/sys-firmware/intel-microcode/intel-microcode-20180108-r1.ebuild b/sys-firmware/intel-microcode/intel-microcode-20180108-r1.ebuild
index 60ae099579f5..fc785810409a 100644
--- a/sys-firmware/intel-microcode/intel-microcode-20180108-r1.ebuild
+++ b/sys-firmware/intel-microcode/intel-microcode-20180108-r1.ebuild
@@ -33,7 +33,7 @@ DEFAULT_MICROCODE_SIGNATURES=""
 # only current CPU: MICROCODE_SIGNATURES="-S"
 # only specific CPU: MICROCODE_SIGNATURES="-s 0x00000f4a -s 0x00010676"
 # exclude specific CPU: MICROCODE_SIGNATURES="-s !0x00000686"
-MICROCODE_SIGNATURES="${MICROCODE_SIGNATURES:=${DEFAULT_MICROCODE_SIGNATURES}}"
+: ${MICROCODE_SIGNATURES:=${DEFAULT_MICROCODE_SIGNATURES}}
 
 pkg_pretend() {
 	if [[ "${MICROCODE_SIGNATURES}" != "${DEFAULT_MICROCODE_SIGNATURES}" ]]; then
@@ -65,9 +65,15 @@ src_install() {
 
 	# The earlyfw cpio needs to be in /boot because it must be loaded before
 	# rootfs is mounted.
-	use initramfs && dodir /boot && opts+=( --write-earlyfw="${ED%/}"/boot/intel-uc.img )
+	if use initramfs; then
+		dodir /boot  || die
+		opts+=( --write-earlyfw="${ED%/}"/boot/intel-uc.img )
+	fi
 	# split location:
-	use split-ucode && dodir /lib/firmware/intel-ucode && opts+=( --write-firmware="${ED%/}"/lib/firmware/intel-ucode )
+	if use split-ucode; then
+		dodir /lib/firmware/intel-ucode || die
+		opts+=( --write-firmware="${ED%/}"/lib/firmware/intel-ucode )
+	fi
 
 	iucode_tool \
 		"${opts[@]}" \