--- a/Makefile
+++ b/Makefile
@@ -35,21 +35,26 @@ INSTALL += $(INSTALLOPTIONS)
 
 .PHONY: all build update test build_rpms
 
 
 all:	build
 
 build:
 	$(VIRTUALENV) --distribute --no-site-packages .
+	$(INSTALL) pip
 	$(INSTALL) Distribute
 	$(INSTALL) MoPyTools
 	$(INSTALL) Nose
 	$(INSTALL) WebTest
+	# Build these first because it seems to fail out on some people's
+	# machines but then recover on subsequent build.
+	$(INSTALL) -r dev-reqs.txt
 	$(BUILDAPP) -c $(CHANNEL) $(PYPIOPTIONS) $(DEPS)
+	./bin/python setup.py develop
 	# Pre-compile mako templates into the correct directories.
 	for TMPL in `find . -name '*.mako'`; do ./bin/python -c "from mako.template import Template; Template(filename='$$TMPL', module_directory='`dirname $$TMPL`', uri='`basename $$TMPL`')"; done;
 
 update:
 	$(BUILDAPP) -c $(CHANNEL) $(PYPIOPTIONS) $(DEPS)
 	# Pre-compile mako templates into the correct directories.
 	for TMPL in `find . -name '*.mako'`; do ./bin/python -c "from mako.template import Template; Template(filename='$$TMPL', module_directory='`dirname $$TMPL`', uri='`basename $$TMPL`')"; done;