diff --git a/external/bsd/bmake/usr.bin/Makefile b/external/bsd/bmake/usr.bin/bmake/Makefile
similarity index 99%
rename from external/bsd/bmake/usr.bin/Makefile
rename to external/bsd/bmake/usr.bin/bmake/Makefile
index c6e1c73e302..398bb4c7107 100644
--- a/external/bsd/bmake/usr.bin/Makefile
+++ b/external/bsd/bmake/usr.bin/bmake/Makefile
@@ -25,7 +25,7 @@ SRCS += lstPrev.c
 
 # you can use this Makefile if you have an earlier version of bmake.
 prefix= /usr
-srcdir=	${.CURDIR}/../dist
+srcdir=	${.CURDIR}/../../dist
 
 # Base version on src date
 MAKE_VERSION= 20120620
diff --git a/external/bsd/bmake/usr.bin/config.h b/external/bsd/bmake/usr.bin/bmake/config.h
similarity index 100%
rename from external/bsd/bmake/usr.bin/config.h
rename to external/bsd/bmake/usr.bin/bmake/config.h
diff --git a/external/bsd/bmake/usr.bin/unit-tests/Makefile b/external/bsd/bmake/usr.bin/bmake/unit-tests/Makefile
similarity index 97%
rename from external/bsd/bmake/usr.bin/unit-tests/Makefile
rename to external/bsd/bmake/usr.bin/bmake/unit-tests/Makefile
index bae70ac37f1..4f6fef54fe5 100644
--- a/external/bsd/bmake/usr.bin/unit-tests/Makefile
+++ b/external/bsd/bmake/usr.bin/bmake/unit-tests/Makefile
@@ -16,7 +16,7 @@
 # named makefile which should be added to SUBFILES to hook it in.
 # 
 
-srcdir=	${.CURDIR}/../../dist/unit-tests
+srcdir=	${.CURDIR}/../../../dist/unit-tests
 
 .MAIN: all