diff --git a/sys/arm/conf/BEAGLEBONE b/sys/arm/conf/BEAGLEBONE
index ec515f12e471..f6e0d2e217cb 100644
--- a/sys/arm/conf/BEAGLEBONE
+++ b/sys/arm/conf/BEAGLEBONE
@@ -22,7 +22,7 @@
 
 ident		BEAGLEBONE
 
-include		"../ti/am335x/std.beaglebone"
+include		"../ti/am335x/std.am335x"
 
 makeoptions	WITHOUT_MODULES="ahc"
 
diff --git a/sys/arm/ti/am335x/files.am335x b/sys/arm/ti/am335x/files.am335x
index 31ef7471da39..3bb44e3b60c9 100644
--- a/sys/arm/ti/am335x/files.am335x
+++ b/sys/arm/ti/am335x/files.am335x
@@ -5,6 +5,7 @@ arm/ti/aintc.c				standard
 arm/ti/am335x/am335x_dmtimer.c		standard
 arm/ti/am335x/am335x_lcd.c		optional	sc
 arm/ti/am335x/am335x_lcd_syscons.c	optional	sc
+arm/ti/am335x/am335x_pmic.c		optional	am335x_pmic
 arm/ti/am335x/am335x_prcm.c		standard
 arm/ti/am335x/am335x_pwm.c		standard
 arm/ti/am335x/am335x_scm_padconf.c	standard
diff --git a/sys/arm/ti/am335x/files.beaglebone b/sys/arm/ti/am335x/files.beaglebone
deleted file mode 100644
index ff527ce212da..000000000000
--- a/sys/arm/ti/am335x/files.beaglebone
+++ /dev/null
@@ -1,3 +0,0 @@
-#$FreeBSD$
-
-arm/ti/am335x/am335x_pmic.c			optional	am335x_pmic
diff --git a/sys/arm/ti/am335x/std.beaglebone b/sys/arm/ti/am335x/std.beaglebone
deleted file mode 100644
index 299e822532d2..000000000000
--- a/sys/arm/ti/am335x/std.beaglebone
+++ /dev/null
@@ -1,4 +0,0 @@
-# $FreeBSD$
-
-files		"../ti/am335x/files.beaglebone"
-include		"../ti/am335x/std.am335x"