diff --git a/.gitmodules b/.gitmodules
index 393ce2f389..62798cde4d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,3 +4,6 @@
 [submodule "ostree-releng-scripts"]
 	path = ostree-releng-scripts
 	url = https://github.com/ostreedev/ostree-releng-scripts
+[submodule "rpmdistro-gitoverlay"]
+	path = rpmdistro-gitoverlay
+	url = https://github.com/projectatomic/rpmdistro-gitoverlay
diff --git a/Makefile b/Makefile
index 2fbc3312e8..39e5258c80 100644
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,19 @@
 PREFIX ?= /usr
 DESTDIR ?=
 
-.PHONY: all mantle install
+.PHONY: all mantle rdgo install
 
-all: mantle
+all: mantle rdgo
 
 mantle:
 	cd mantle && ./build ore kola kolet
 
+rdgo:
+	(cd rpmdistro-gitoverlay && ./autogen.sh --prefix=$(PREFIX) --sysconfdir=/etc && make)
+
 install:
 	install -D -t $(DESTDIR)$(PREFIX)/bin coreos-assembler
 	install -D -t $(DESTDIR)$(PREFIX)/lib/coreos-assembler $$(find src/ -maxdepth 1 -type f)
 	install -D -t $(DESTDIR)$(PREFIX)/bin mantle/bin/{ore,kola}
 	install -D -m 0755 -t $(DESTDIR)$(PREFIX)/lib/kola/amd64 mantle/bin/amd64/kolet
+	(cd rpmdistro-gitoverlay && make install)
diff --git a/build.sh b/build.sh
index c23b5257ac..e8c46d9c8b 100755
--- a/build.sh
+++ b/build.sh
@@ -18,21 +18,6 @@ configure_yum_repos() {
         mv ${repo}.new ${repo}
     done
 
-    # enable `walters/buildtools-fedora` copr
-	# pulled from https://copr.fedorainfracloud.org/coprs/walters/buildtools-fedora/repo/fedora-28/walters-buildtools-fedora-fedora-28.repo
-    cat > /etc/yum.repos.d/walters-buildtools-fedora-fedora-28.repo  <<'EOF'
-[walters-buildtools-fedora]
-name=Copr repo for buildtools-fedora owned by walters
-baseurl=https://copr-be.cloud.fedoraproject.org/results/walters/buildtools-fedora/fedora-$releasever-$basearch/
-type=rpm-md
-skip_if_unavailable=True
-gpgcheck=1
-gpgkey=https://copr-be.cloud.fedoraproject.org/results/walters/buildtools-fedora/pubkey.gpg
-repo_gpgcheck=0
-enabled=1
-enabled_metadata=1
-EOF
-
     # enable `dustymabe/ignition` copr
 	# pulled from https://copr.fedorainfracloud.org/coprs/dustymabe/ignition/repo/fedora-28/dustymabe-ignition-fedora-28.repo
     cat > /etc/yum.repos.d/dustymabe-ignition-fedora-28.repo <<'EOF'
diff --git a/rpmdistro-gitoverlay b/rpmdistro-gitoverlay
new file mode 160000
index 0000000000..10203761eb
--- /dev/null
+++ b/rpmdistro-gitoverlay
@@ -0,0 +1 @@
+Subproject commit 10203761ebd50dcf6a2f63aad9d276ba787ba37c
diff --git a/src/deps.txt b/src/deps.txt
index 52ce40edd7..5437ce107f 100644
--- a/src/deps.txt
+++ b/src/deps.txt
@@ -9,7 +9,7 @@ dumb-init
 rpm-ostree
 
 # rpmdistro-gitoverlay deps
-dnf-plugins-core createrepo_c dnf-utils fedpkg openssh-clients rpmdistro-gitoverlay
+dnf-plugins-core createrepo_c dnf-utils fedpkg openssh-clients
 
 # Currently a transitive req of rpmdistro-gitoverlay via mock, but we
 # expect people to use these explicitly in their repo configurations.