diff --git a/sys/dev/sfxge/common/hunt_vpd.c b/sys/dev/sfxge/common/ef10_vpd.c
similarity index 99%
rename from sys/dev/sfxge/common/hunt_vpd.c
rename to sys/dev/sfxge/common/ef10_vpd.c
index b4c6d26236a..8eef3ad66da 100644
--- a/sys/dev/sfxge/common/hunt_vpd.c
+++ b/sys/dev/sfxge/common/ef10_vpd.c
@@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$");
 
 #if EFSYS_OPT_VPD
 
-#if EFSYS_OPT_HUNTINGTON
+#if EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD
 
 #include "ef10_tlv_layout.h"
 
@@ -458,6 +458,6 @@ ef10_vpd_fini(
 	}
 }
 
-#endif	/* EFSYS_OPT_HUNTINGTON */
+#endif	/* EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD */
 
 #endif	/* EFSYS_OPT_VPD */
diff --git a/sys/modules/sfxge/Makefile b/sys/modules/sfxge/Makefile
index 1019c5beb0f..9c1225c55c2 100644
--- a/sys/modules/sfxge/Makefile
+++ b/sys/modules/sfxge/Makefile
@@ -30,11 +30,10 @@ SRCS+=	siena_sram.c siena_vpd.c
 SRCS+=	siena_flash.h siena_impl.h
 
 SRCS+=	ef10_ev.c ef10_filter.c ef10_intr.c ef10_mac.c ef10_mcdi.c ef10_nic.c
-SRCS+=	ef10_nvram.c ef10_phy.c ef10_rx.c ef10_tx.c
+SRCS+=	ef10_nvram.c ef10_phy.c ef10_rx.c ef10_tx.c ef10_vpd.c
 SRCS+=	ef10_impl.h
 
-SRCS+=	hunt_nic.c
-SRCS+=	hunt_phy.c hunt_vpd.c
+SRCS+=	hunt_nic.c hunt_phy.c
 SRCS+=	hunt_impl.h
 
 SRCS+=	medford_nic.c