diff --git a/nixos-modules/default.nix b/nixos-modules/default.nix
index c77e7a8..bfbac7a 100644
--- a/nixos-modules/default.nix
+++ b/nixos-modules/default.nix
@@ -66,7 +66,7 @@ let
       "stdcxx"
       "terminal"
       "terminal_log"
-      "vbox5"
+      "vbox5-nova"
       "intel_fb_drv"
       "vfs"
       "vfs_audit"
diff --git a/nixos-modules/dhall/simple.dhall b/nixos-modules/dhall/simple.dhall
index 58ec501..dc0fd87 100644
--- a/nixos-modules/dhall/simple.dhall
+++ b/nixos-modules/dhall/simple.dhall
@@ -369,7 +369,7 @@ let rootInit =
 
                 in  Child.flat
                       Child.Attributes::{
-                      , binary = "virtualbox5"
+                      , binary = "virtualbox5-nova"
                       , config = Init.Config::{
                         , attributes = toMap
                             { vbox_file = "machine.vbox"
diff --git a/packages/genodelabs/default.nix b/packages/genodelabs/default.nix
index 0cf2848..f55b0c4 100644
--- a/packages/genodelabs/default.nix
+++ b/packages/genodelabs/default.nix
@@ -63,7 +63,8 @@ let
   preparePort = name:
     { hash ? "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="
     , patches ? [ ], ... }@args:
-    let havePatches = patches != [ ];
+    let
+      havePatches = patches != [ ];
       version = builtins.getAttr name (import "${genodeSources}/ports.nix");
     in stdenvNoCC.mkDerivation (args // {
       name = name + "-port-" + version;
diff --git a/packages/genodelabs/ports.nix b/packages/genodelabs/ports.nix
index bc2b74c..7dac09c 100644
--- a/packages/genodelabs/ports.nix
+++ b/packages/genodelabs/ports.nix
@@ -3,7 +3,7 @@
 with buildPackages; {
   dde_bsd.hash = "sha256-2ilZs6JkcQAvU/sQYnHunGtGRZDt7qLTpKZxQxSOf2I=";
   dde_ipxe.hash = "sha256-NJ129+DkxFg1fFHJBABBFRRjqEVNSz6v2hEB80AuEM4=";
-  dde_linux.hash = "sha256-3G5Mprv9ZBNhDJRuVF6Nrkp3KbFaN10IKFq0OdyAY9M=";
+  dde_linux.hash = "sha256-aUp90z8dtn48QNUqGe1b08RzbESFmCJl7ECZf+lr0rg=";
   dde_rump = {
     hash = "sha256-Wr5otGkWEa+5xImsFHQzwap5LckNEbyWA/7xbNcOreI=";
     nativeBuildInputs = [ subversion ];
@@ -13,7 +13,7 @@ with buildPackages; {
   jitterentropy.hash = "sha256-6KS732GxtUMz0xPYKtshdn039DgdJq11vTDQesZn4Ds=";
   jpeg.hash = "sha256-RLVnlrnYGrhqr3Feikoi/BNditCaKN0u3t9/UDpl2wQ=";
   libc = {
-    hash = "sha256-RL5l7GHlczc/6Uils9WCuPh9cCawx6XZ4H0HLPdMmAA=";
+    hash = "sha256-V0gkHLf0TCjFHdyRN7F/7fekz+UwSsV0b2HAAp4iQvo=";
     nativeBuildInputs = [ buildPackages.gcc subversion ];
   };
   libiconv.hash = "sha256-25YcW5zo1fE33ZolGQroR+KZO8wHEdN1QXa7+MhwS78=";
@@ -35,7 +35,7 @@ with buildPackages; {
   stb.hash = "sha256-9LSH1i8jcEvjRAmTvgtK+Axy9hO7uiSzmSgBvs0zkTc=";
   stdcxx.hash = "sha256-iiE009fL1yE3XJ7HkaJakOiS++m7qONwwGrdJjBXQ7k=";
   virtualbox5 = {
-    hash = "sha256-qTdaJX8plHJV9z5MN68gFwGNhcGFu3f2WwkVkBGu/ck=";
+    hash = "sha256-mzn+cV/PriEMQV+m45e2n9w5piogmavc1qgxJVDgqQg=";
     nativeBuildInputs = [ iasl libxslt unzip yasm ];
     patches = [ ./vbox5-iasl.patch ./vbox_main.patch.patch ];
   };
diff --git a/packages/genodelabs/targets.nix b/packages/genodelabs/targets.nix
index d033a71..a354350 100644
--- a/packages/genodelabs/targets.nix
+++ b/packages/genodelabs/targets.nix
@@ -1,5 +1,16 @@
 { buildPackages, ports }:
-with ports; {
+with ports;
+let
+  vbox' = {
+    nativeBuildInputs = with buildPackages; [ iasl yasm ];
+    patches = [
+      ./vbox5-iasl.patch
+      ./vbox-framebuffer-fail-on-fail.patch
+      ./vbox-debug.patch
+    ];
+    portInputs = [ libc libiconv qemu-usb stdcxx virtualbox5 ];
+  };
+in {
 
   gpt_write.portInputs = [ jitterentropy ];
 
@@ -47,17 +58,9 @@ with ports; {
 
   usb_drv.portInputs = [ dde_linux ];
 
-  vbox5 = {
-    nativeBuildInputs = with buildPackages; [ iasl yasm ];
-    patches = [ ./vbox5-iasl.patch ./vbox-framebuffer-fail-on-fail.patch ./vbox-debug.patch ];
-    portInputs = [ libc libiconv qemu-usb stdcxx virtualbox5 ];
-  };
+  vbox5 = vbox';
 
-  vbox5-nova = {
-    nativeBuildInputs = with buildPackages; [ iasl yasm ];
-    patches = [ ./vbox5-iasl.patch ./vbox-framebuffer-fail-on-fail.patch ];
-    portInputs = [ libc libiconv qemu-usb stdcxx virtualbox5 ];
-  };
+  vbox5-nova = vbox';
 
   vesa_drv.portInputs = [ libc x86emu ];