diff --git a/scripts/.gitignore b/scripts/.gitignore
index 6518c0f07..53f46d913 100644
--- a/scripts/.gitignore
+++ b/scripts/.gitignore
@@ -8,5 +8,4 @@ mk-am35xx-spi-image
 mkimage
 mkublheader
 omap_signGP
-omap4_usbboot
 zynq_mkimage
diff --git a/scripts/Makefile b/scripts/Makefile
index 7d98a2d2f..71d30be20 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -17,16 +17,13 @@ hostprogs-$(CONFIG_ARCH_DAVINCI) += mkublheader
 hostprogs-$(CONFIG_ARCH_ZYNQ)	 += zynq_mkimage
 
 subdir-y			+= mod
+subdir-$(CONFIG_OMAP4_USBBOOT)	+= omap4_usbboot
 subdir-$(CONFIG_ARCH_IMX)	+= imx
 subdir-$(CONFIG_X86)		+= setupmbr
 subdir-$(CONFIG_DTC)		+= dtc
 
 targetprogs-$(CONFIG_BAREBOXENV_TARGET) += bareboxenv-target
 
-HOSTLOADLIBES_omap4_usbboot = -lpthread
-omap4_usbboot-objs               := usb_linux.o omap4_usbboot.o
-hostprogs-$(CONFIG_OMAP4_USBBOOT)+= omap4_usbboot
-
 # Let clean descend into subdirs
 subdir-	+= basic kconfig setupmbr
 
diff --git a/scripts/omap4_usbboot/.gitignore b/scripts/omap4_usbboot/.gitignore
new file mode 100644
index 000000000..1975a2172
--- /dev/null
+++ b/scripts/omap4_usbboot/.gitignore
@@ -0,0 +1 @@
+omap4_usbboot
diff --git a/scripts/omap4_usbboot/Makefile b/scripts/omap4_usbboot/Makefile
new file mode 100644
index 000000000..af6444b0e
--- /dev/null
+++ b/scripts/omap4_usbboot/Makefile
@@ -0,0 +1,5 @@
+HOSTLOADLIBES_omap4_usbboot = -lpthread
+omap4_usbboot-objs := usb_linux.o omap4_usbboot.o
+hostprogs-$(CONFIG_OMAP4_USBBOOT) += omap4_usbboot
+
+always	:= $(hostprogs-y)
diff --git a/scripts/omap4_usbboot.c b/scripts/omap4_usbboot/omap4_usbboot.c
similarity index 100%
rename from scripts/omap4_usbboot.c
rename to scripts/omap4_usbboot/omap4_usbboot.c
diff --git a/scripts/usb.h b/scripts/omap4_usbboot/usb.h
similarity index 100%
rename from scripts/usb.h
rename to scripts/omap4_usbboot/usb.h
diff --git a/scripts/usb_linux.c b/scripts/omap4_usbboot/usb_linux.c
similarity index 100%
rename from scripts/usb_linux.c
rename to scripts/omap4_usbboot/usb_linux.c