diff --git a/build/README.md b/build/README.md
index cae71d9eca..8575572f57 100644
--- a/build/README.md
+++ b/build/README.md
@@ -1,6 +1,30 @@
 
 # Rpm Build Instructions
 
+##  Using `docker-compose`
+
+We are moving toward using a docker-based build system.  This eliminates the need to maintain a local installation with all the
+build tools as well as ensuring that you are using the same versions as we use for testing.
+
+These are the versions of these tools we are using:
+* docker 1.12.2
+* docker-compose 1.8.1
+
+You can build from any repository/branch combination,  but that repository must be available to `git clone ...`.  Note that in the
+following `docker-compose` commands, you can limit building to one or more sub-projects by supplying arguments at the end.  If none
+are supplied,  then *all* will be run.
+
+Starting at the top-level of your trafficcontrol git clone (e.g. `~/src/incubator-trafficcontrol`):
+
+> cd infrastructure/docker/build
+> docker-compose build traffic_ops_build traffic_monitor_build ...
+> GITREPO=https://github.com/username/incubator-trafficcontrol BRANCH=mybranch docker-compose up traffic_ops_build traffic_monitor_build ...
+
+The resulting `.rpm` files will be created in the `artifacts` directory.
+
+
+## Building the old-fashioned way
+
 rpm files for all sub-projects can be built using the file `build/build.sh`.  If this script is given parameters, it will build only
 those projects specified on the command line, e.g.  `$ ./build/build.sh traffic_ops`.  The prerequisites for each sub-project are
 listed below.
diff --git a/build/docker-build.sh b/build/docker-build.sh
deleted file mode 100755
index 01005be9c6..0000000000
--- a/build/docker-build.sh
+++ /dev/null
@@ -1,94 +0,0 @@
-#!/bin/bash
-#
-# docker-build.sh creates containers for building each component of traffic_control with
-# all needed dependencies.  Once the build is complete, all rpms are copied into the "dist"
-# directory in the current directory.
-#
-# Usage: docker-build.sh [<options>]
-# Options:
-#    -r <gitrepo> git repository to clone from (defaults to value of GITREPO env variable or
-#		  `https://github.com/Comcast/traffic_control').  Can be a URI or local directory.
-#    -b <branch>  branch (or tag) in repository to checkout (defaults to value of BRANCH env variable or `master')
-#    -d <dir>     directory to copy build artifacts (default is ./dist)
-
-export GITREPO="${GITREPO:-https://github.com/Comcast/traffic_control}"
-export BRANCH="${BRANCH:-master}"
-
-Usage() {
-	echo "Usage:"
-	echo "	$0 [<option>...] [<project name>...]"
-	echo "	One of -a or list of projects must be provided."
-	echo "	Options:"
-	echo "		-a 			build all subprojects"
-	echo "		-h			show usage"
-	echo "		-r <repository path>:	repository (local directory or https) to clone from"
-	echo "		-b <branch name>:	branch within repository"
-	echo ""
-}
-
-while getopts :hacr:b:d: opt
-do
-	case $opt in
-		h)	Usage
-			exit 1;
-			;;
-		a)	buildall=1
-			;;
-		r)
-			GITREPO="$OPTARG"
-			;;
-		b)
-			BRANCH="$OPTARG"
-			;;
-		*) 
-			echo "Invalid option: $opt"
-			Usage
-			exit 1;
-			;;
-	esac
-done
-shift $((OPTIND-1))
-
-# anything remaining is list of projects to build
-if [[ -n $buildall ]]
-then
-	projects="traffic_ops traffic_monitor traffic_router traffic_stats traffic_portal"
-else
-	projects="$@"
-fi
-
-if [[ -z $projects ]]
-then
-	echo "One of -a or list of project names must be provided"
-	Usage
-	exit 1
-fi
-
-
-# if repo is local directory, get absolute path
-if [[ -d $GITREPO ]]
-then
-	GITREPO=$(cd $GITREPO && pwd)
-fi
-
-DIR="$( cd "$(dirname $( dirname "${BASH_SOURCE[0]}" ))" && pwd )"
-
-cd $DIR/infrastructure/docker/build
-dist=$(pwd)/artifacts
-
-cat <<-ENDMSG
-	********************************************************
-	
-	Building from git repository '$GITREPO' branch '$BRANCH'
-	Artifacts will be delivered to '$dist'
-
-	Projects to build: $projects
-	********************************************************
-
-ENDMSG
-
-# GITREPO and BRANCH are exported, so this will pick them up..
-docker-compose up
-
-echo "rpms created in $dist: "
-ls -l "$dist/."
diff --git a/infrastructure/docker/build/Dockerfile-traffic_monitor b/infrastructure/docker/build/Dockerfile-traffic_monitor
index 1a253b78d0..ec8aa69248 100644
--- a/infrastructure/docker/build/Dockerfile-traffic_monitor
+++ b/infrastructure/docker/build/Dockerfile-traffic_monitor
@@ -8,7 +8,7 @@ RUN	yum -y install \
 		rpm-build && \
 	yum -y clean all
 
-ENV GITREPO=https://github.com/Comcast/traffic_control
+ENV GITREPO=https://github.com/apache/incubator-trafficcontrol
 ENV BRANCH=master
 
 # Above are common for all sub-projects.
diff --git a/infrastructure/docker/build/Dockerfile-traffic_ops b/infrastructure/docker/build/Dockerfile-traffic_ops
index 87c6458d0a..9ab2b0a9cf 100644
--- a/infrastructure/docker/build/Dockerfile-traffic_ops
+++ b/infrastructure/docker/build/Dockerfile-traffic_ops
@@ -26,7 +26,7 @@ RUN yum install -y \
 
 
 # all ENV vars can be controlled by, e.g. `docker run -e BRANCH=1.6.x <image>`
-ENV GITREPO=https://github.com/Comcast/traffic_control
+ENV GITREPO=https://github.com/apache/incubator-trafficcontrol
 ENV BRANCH=master
 
 WORKDIR /repo
diff --git a/infrastructure/docker/build/Dockerfile-traffic_portal b/infrastructure/docker/build/Dockerfile-traffic_portal
index 5763459c81..37fa848fc1 100644
--- a/infrastructure/docker/build/Dockerfile-traffic_portal
+++ b/infrastructure/docker/build/Dockerfile-traffic_portal
@@ -8,7 +8,7 @@ RUN	yum -y install \
 		rpm-build && \
 	yum -y clean all
 
-ENV GITREPO https://github.com/Comcast/traffic_control
+ENV GITREPO https://github.com/apache/incubator-trafficcontrol
 ENV BRANCH master
 
 WORKDIR /repo
diff --git a/infrastructure/docker/build/Dockerfile-traffic_router b/infrastructure/docker/build/Dockerfile-traffic_router
index 733c738a71..8f7c139328 100644
--- a/infrastructure/docker/build/Dockerfile-traffic_router
+++ b/infrastructure/docker/build/Dockerfile-traffic_router
@@ -8,7 +8,7 @@ RUN	yum -y install \
 		rpm-build && \
 	yum -y clean all
 
-ENV GITREPO https://github.com/Comcast/traffic_control
+ENV GITREPO https://github.com/apache/incubator-trafficcontrol
 ENV BRANCH master
 
 WORKDIR /repo
diff --git a/infrastructure/docker/build/Dockerfile-traffic_stats b/infrastructure/docker/build/Dockerfile-traffic_stats
index dbf66c8e19..d81914f4b1 100644
--- a/infrastructure/docker/build/Dockerfile-traffic_stats
+++ b/infrastructure/docker/build/Dockerfile-traffic_stats
@@ -8,7 +8,7 @@ RUN	yum -y install \
 		rpm-build && \
 	yum -y clean all
 
-ENV GITREPO https://github.com/Comcast/traffic_control
+ENV GITREPO https://github.com/apache/incubator-trafficcontrol
 ENV BRANCH master
 
 WORKDIR /repo
diff --git a/infrastructure/docker/build/README.md b/infrastructure/docker/build/README.md
index 6e7a7bd4e0..a6003408b3 100644
--- a/infrastructure/docker/build/README.md
+++ b/infrastructure/docker/build/README.md
@@ -1,9 +1,9 @@
 
-# Building *traffic_control* using *docker-compose*
+# Building *trafficcontrol* using *docker-compose*
 
 - install `docker-engine` and `docker-compose`
-- `cd traffic_control/infrastructure/docker/build`
-- `export GITREPO=https://github.com/<username>/traffic_control`
+- `cd incubator-trafficcontrol/infrastructure/docker/build`
+- `export GITREPO=https://github.com/<username>/incubator-trafficcontrol`
 - `export BRANCH=mynewbranch`
 - `docker-compose up traffic_monitor_build traffic_ops_build ...`
 - new rpm files will be in `./artifacts`
diff --git a/infrastructure/docker/build/docker-compose.yml b/infrastructure/docker/build/docker-compose.yml
index b219c5fe65..861a3f32dc 100644
--- a/infrastructure/docker/build/docker-compose.yml
+++ b/infrastructure/docker/build/docker-compose.yml
@@ -1,11 +1,11 @@
 ---
 
-# Build configuration for traffic_control
+# Build configuration for trafficcontrol
 # Usage:
 #    GITREPO=...  BRANCH=...  docker-compose up [<service>...]
 #
-# where GITREPO is https path to traffic_control clone
-#   (default: https://github.com/Comcast/traffic_control)
+# where GITREPO is https path to trafficcontrol clone
+#   (default: https://github.com/apache/incubator-trafficcontrol)
 # and <branch> is name of branch to test
 #   (default: master).
 #
diff --git a/infrastructure/docker/build/run-build.sh b/infrastructure/docker/build/run-build.sh
index cbe00a9452..fd6b78471f 100755
--- a/infrastructure/docker/build/run-build.sh
+++ b/infrastructure/docker/build/run-build.sh
@@ -4,17 +4,18 @@ target=$1
 [[ -z $target ]] && echo "No target specified"
 echo "Building $target"
 
-echo "GITREPO=${GITREPO:=https://github.com/Comcast/traffic_control}"
+echo "GITREPO=${GITREPO:=https://github.com/apache/incubator-trafficcontrol}"
 echo "BRANCH=${BRANCH:=master}"
 
+dir=$(basename $GITREPO)
 set -x
-git clone $GITREPO -b $BRANCH traffic_control
+git clone "$GITREPO" -b "$BRANCH" $dir || echo "Clone failed: $!"
 
-cd traffic_control/$target
+cd $dir/$target
 ./build/build_rpm.sh
 mkdir -p /artifacts
 cp ../dist/* /artifacts/.
 
 # Clean up for next build
 cd -
-rm -r traffic_control
+rm -r $dir