diff --git a/.gitignore b/.gitignore
index 358931604..42d7044bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,8 +9,6 @@
 /repos/base-fiasco/contrib
 /repos/base-fiasco/download
 /repos/base-foc/contrib
-/repos/base-nova/contrib
-/repos/base-nova/download
 /repos/base-pistachio/contrib
 /repos/dde_ipxe/contrib
 /repos/dde_linux/contrib
diff --git a/repos/base-nova/Makefile b/repos/base-nova/Makefile
index f77c2aae7..59dc28b86 100644
--- a/repos/base-nova/Makefile
+++ b/repos/base-nova/Makefile
@@ -5,28 +5,16 @@
 # \date   2012-06-04
 #
 
-VERBOSE     ?= @
-ECHO        = @echo
-GIT_URL     = https://github.com/alex-ab/NOVA.git
-GIT_REV     = HEAD
-GIT_BRANCH  = r5
-CONTRIB_DIR = contrib
-PATCHES     = $(shell find patches -name '*.patch')
-
-#
-# Utility to check if a tool is installed
-#
-check_tool = $(if $(shell which $(1)),,$(error Need to have '$(1)' installed.))
-
-$(call check_tool,git)
-$(call check_tool,patch)
+VERBOSE ?= @
+ECHO    := @echo
 
 #
 # Print help information by default
 #
 help::
 
-prepare: $(CONTRIB_DIR)
+prepare:
+	$(VERBOSE)../../tool/ports/prepare_port nova
 
 help::
 	$(ECHO)
@@ -37,18 +25,3 @@ help::
 	$(ECHO) "clean   - remove upstream source codes"
 	$(ECHO)
 
-$(CONTRIB_DIR)/.git:
-	$(VERBOSE)git clone $(GIT_URL) $(CONTRIB_DIR)
-
-.PHONY: $(CONTRIB_DIR)
-
-$(CONTRIB_DIR): $(CONTRIB_DIR)/.git
-	$(VERBOSE)cd $(CONTRIB_DIR); git pull
-	$(VERBOSE)cd $(CONTRIB_DIR); git reset --hard $(GIT_REV); git checkout $(GIT_BRANCH)
-	$(ECHO) "applying patches to '$(CONTRIB_DIR)/'"
-	$(VERBOSE)for i in $(PATCHES); do patch -d $@ -p1 < $$i; done
-
-.PHONY: $(CONTRIB_DIR)
-
-clean::
-	$(VERBOSE)rm -rf $(CONTRIB_DIR)
diff --git a/repos/base-nova/ports/nova.hash b/repos/base-nova/ports/nova.hash
new file mode 100644
index 000000000..421376db9
--- /dev/null
+++ b/repos/base-nova/ports/nova.hash
@@ -0,0 +1 @@
+dummy
diff --git a/repos/base-nova/ports/nova.port b/repos/base-nova/ports/nova.port
new file mode 100644
index 000000000..517a1a5c6
--- /dev/null
+++ b/repos/base-nova/ports/nova.port
@@ -0,0 +1,9 @@
+LICENSE   := GPLv2
+VERSION   := git
+DOWNLOADS := nova.git
+
+URL(nova) := https://github.com/alex-ab/NOVA.git
+REV(nova) := r5
+DIR(nova) := src/kernel/nova
+
+PATCHES   := $(wildcard $(REP_DIR)/patches/*.patch)
diff --git a/repos/base-nova/src/kernel/target.mk b/repos/base-nova/src/kernel/target.mk
index 9802473fa..59e2ba88c 100644
--- a/repos/base-nova/src/kernel/target.mk
+++ b/repos/base-nova/src/kernel/target.mk
@@ -1,6 +1,6 @@
 TARGET           = hypervisor
 REQUIRES         = x86 nova
-NOVA_SRC_DIR     = $(REP_DIR)/contrib
+NOVA_SRC_DIR     = $(call select_from_ports,nova)/src/kernel/nova
 NOVA_BUILD_DIR   = $(BUILD_BASE_DIR)/kernel
 STARTUP_LIB      =
 SRC_CC           = $(sort $(notdir $(wildcard $(NOVA_SRC_DIR)/src/*.cpp)))