diff --git a/bsp/beagleboard/beagleboard-standard.scc b/bsp/beagleboard/beagleboard-standard.scc
index 8e11bc5e0c18f55cf24fe980f1ed0bd21bb5141a..311b740db065e3740a6731c486b896f7702096dd 100644
--- a/bsp/beagleboard/beagleboard-standard.scc
+++ b/bsp/beagleboard/beagleboard-standard.scc
@@ -7,6 +7,10 @@ branch beagleboard
 
 include beagleboard.scc
 
+# preemption is causing boot problems with some SDs, so disabling
+# it for the standard kernel
+include no-preempt.scc
+
 # default policy for standard kernels
 include features/latencytop/latencytop.scc
 include features/profiling/profiling.scc
diff --git a/bsp/beagleboard/beagleboard.scc b/bsp/beagleboard/beagleboard.scc
index c0dd025ee018113328098a132f79fc077875001f..6a408beb5a754ce3595d73752a3ded644b27e6cf 100644
--- a/bsp/beagleboard/beagleboard.scc
+++ b/bsp/beagleboard/beagleboard.scc
@@ -4,4 +4,3 @@ kconf non-hardware beagleboard-non_hardware.cfg
 include features/usb-net/usb-net.scc
 include wifi.scc
 include wl1271.scc
-include no-preempt.scc