diff --git a/.gitignore b/.gitignore
index c85f62ba9..b5606d1fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,7 +6,6 @@ build/manifest
 build/oe
 build/oeenv
 build/pseudodone
-build/repos
 build/cache
 build/sstate-cache
 build/tmp-glibc
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 000000000..0931b95cb
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,20 @@
+[submodule "build/repos/openembedded-core"]
+	path = build/repos/openembedded-core
+	url = git://git.openembedded.org/openembedded-core
+	update = none
+[submodule "build/repos/bitbake"]
+	path = build/repos/bitbake
+	url = git://git.openembedded.org/bitbake.git
+	branch = 1.28
+[submodule "build/repos/meta-openembedded"]
+	path = build/repos/meta-openembedded
+	url = git://git.openembedded.org/meta-openembedded
+	update = none
+[submodule "build/repos/meta-java"]
+	path = build/repos/meta-java
+	url = git://git.yoctoproject.org/meta-java
+	update = none
+[submodule "build/repos/meta-selinux"]
+	path = build/repos/meta-selinux
+	url = git://git.yoctoproject.org/meta-selinux
+	update = none
diff --git a/build/repos/bitbake b/build/repos/bitbake
new file mode 160000
index 000000000..b993d9620
--- /dev/null
+++ b/build/repos/bitbake
@@ -0,0 +1 @@
+Subproject commit b993d96203541cd2919d688559ab802078a7a506
diff --git a/build/repos/meta-java b/build/repos/meta-java
new file mode 160000
index 000000000..a73939323
--- /dev/null
+++ b/build/repos/meta-java
@@ -0,0 +1 @@
+Subproject commit a73939323984fca1e919d3408d3301ccdbceac9c
diff --git a/build/repos/meta-openembedded b/build/repos/meta-openembedded
new file mode 160000
index 000000000..8ab04afbf
--- /dev/null
+++ b/build/repos/meta-openembedded
@@ -0,0 +1 @@
+Subproject commit 8ab04afbffb4bc5184cfe0655049de6f44269990
diff --git a/build/repos/meta-selinux b/build/repos/meta-selinux
new file mode 160000
index 000000000..4c75d9cbc
--- /dev/null
+++ b/build/repos/meta-selinux
@@ -0,0 +1 @@
+Subproject commit 4c75d9cbcf1d75043c7c5ab315aa383d9b227510
diff --git a/build/repos/openembedded-core b/build/repos/openembedded-core
new file mode 160000
index 000000000..1f4bfa330
--- /dev/null
+++ b/build/repos/openembedded-core
@@ -0,0 +1 @@
+Subproject commit 1f4bfa33073584c25396d74f3929f263f3df188b
diff --git a/setup_build-next.sh b/setup_build-next.sh
index 6a1f63cc4..f363fa8d4 100755
--- a/setup_build-next.sh
+++ b/setup_build-next.sh
@@ -47,8 +47,8 @@ process_git_repo() {
 	local repo="$2"
 	local branch="$3"
 
-	if [ ! -d $path ]; then
-		# The path does not exist.  Proceed.
+	if [ ! -d $path ] || [ -z "`ls -A $path`" ]; then
+		# The path does not exist or is empty.  Proceed.
 		fetch_git_repo $path $repo $branch
 		checkout_git_branch $path $branch
 	fi