diff --git a/srcpkgs/bumblebee/template b/srcpkgs/bumblebee/template
index 63bb1c3e8c8..aa4dba61570 100644
--- a/srcpkgs/bumblebee/template
+++ b/srcpkgs/bumblebee/template
@@ -20,17 +20,14 @@ long_desc="
  while waiting for kernel and drivers to support these notebooks."
 
 post_install() {
-	# ??? Stop nvidia from loading on boot
-	#mkdir -p ${DESTDIR}/usr/lib/modprobe.d
-	#echo "blacklist nvidia" > ${DESTDIR}/usr/lib/modprobe.d/bumblebee.conf
-
 	# Install systemd unit
 	vinstall scripts/systemd/bumblebeed.service 644 \
 		usr/lib/systemd/system
 
 	# Make bash_completion work
+	mkdir -p ${DESTDIR}/usr/share/bash-completion/completions
 	mv -v ${DESTDIR}/etc/bash_completion.d/bumblebee \
-		${DESTDIR}/etc/bash_completion.d/optirun
+		${DESTDIR}/usr/share/bash-completion/completions/optirun
 }