diff --git a/app-emulation/virtualbox/files/virtualbox-ose-6-wrapper b/app-emulation/virtualbox/files/virtualbox-ose-6-wrapper
index 6108afe14b26d..af8090dd09afd 100644
--- a/app-emulation/virtualbox/files/virtualbox-ose-6-wrapper
+++ b/app-emulation/virtualbox/files/virtualbox-ose-6-wrapper
@@ -84,9 +84,9 @@ case "$APP" in
     VirtualBox|virtualbox)
         exec "$INSTALL_DIR/VirtualBox" "$@"
         ;;
-    #VirtualBoxVM|virtualboxvm)
-    #    exec "$INSTALL_DIR/VirtualBoxVM" "$@"
-    #    ;;
+    VirtualBoxVM|virtualboxvm)
+        exec "$INSTALL_DIR/VirtualBoxVM" "$@"
+        ;;
     VBoxManage|vboxmanage)
         exec "$INSTALL_DIR/VBoxManage" "$@"
         ;;
diff --git a/app-emulation/virtualbox/virtualbox-6.0.4.ebuild b/app-emulation/virtualbox/virtualbox-6.0.4-r1.ebuild
similarity index 99%
rename from app-emulation/virtualbox/virtualbox-6.0.4.ebuild
rename to app-emulation/virtualbox/virtualbox-6.0.4-r1.ebuild
index 32183eb05b9ff..e8d806027ab35 100644
--- a/app-emulation/virtualbox/virtualbox-6.0.4.ebuild
+++ b/app-emulation/virtualbox/virtualbox-6.0.4-r1.ebuild
@@ -363,8 +363,7 @@ src_install() {
 				pax-mark -m "${ED%/}"${vbox_inst_path}/VBoxTestOGL
 			fi
 
-			#for each in virtualbox{,vm} VirtualBox{,VM} ; do
-			for each in virtualbox VirtualBox ; do
+			for each in virtualbox{,vm} VirtualBox{,VM} ; do
 				dosym ${vbox_inst_path}/VBox /usr/bin/${each}
 			done