diff --git a/device/Makefile b/device/Makefile
index 78d2d3864e..88f1ada8ac 100644
--- a/device/Makefile
+++ b/device/Makefile
@@ -28,3 +28,7 @@ STAGE2_DEVICE_SRC = device.c device_util.c root_device.c \
 		    pci_device.c pci_ops.c pci_rom.c pnp_device.c pnp_raw.c \
 			smbus_ops.c
 
+# this is only needed on the K8
+ifeq ($(CONFIG_NORTHBRIDGE_AMD_K8),y)
+STAGE2_DEVICE_SRC += hypertransport.c
+endif
diff --git a/northbridge/amd/k8/Makefile b/northbridge/amd/k8/Makefile
index 9366319d00..2b7f2ba652 100644
--- a/northbridge/amd/k8/Makefile
+++ b/northbridge/amd/k8/Makefile
@@ -26,7 +26,6 @@ STAGE2_CHIPSET_SRC += $(src)/northbridge/amd/k8/get_sblk_pci1234.c \
 					$(src)/northbridge/amd/k8/common.c \
 					$(src)/northbridge/amd/k8/cpu.c \
 					$(src)/northbridge/amd/k8/domain.c \
-					$(src)/northbridge/amd/k8/pci.c \
-					$(src)/device/hypertransport.c
+					$(src)/northbridge/amd/k8/pci.c
 
 endif