diff --git a/Makefile.common b/Makefile.common
index fd11a26..67e03a4 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -1,62 +1,62 @@
 SHELL = /bin/bash
 TOPLVL = "../."
 
 SPECFILE = $(shell if [ -f package.yml ]; then echo "package.yml"; else echo "pspec.xml"; fi; )
 SPECFILE2 = $(shell if [ -f pspec_x86_64.xml ]; then echo "pspec_x86_64.xml"; else echo "pspec.xml"; fi; )
 TAG=$(shell $(TOPLVL)/common/Scripts/gettag.py $(SPECFILE))
 SOURCE=$(shell basename $(shell dirname $(abspath $(SPECFILE))))
 SIGNTAG=$(shell if [ `git config commit.gpgsign` == "true" ]; then echo "-s"; else echo " "; fi; )
 
 complete:
 	make build
 	make abireport
 
 abireport:
 	python3 $(TOPLVL)/common/Scripts/abireport.py `dirname $(SPECFILE)`
 
 build:
-	sudo evobuild build $(SPECFILE) -p unstable-x86_64; 
+	sudo solbuild build $(SPECFILE) -p unstable-x86_64; 
 
 cvecheck:
 	cve-check-tool $(SPECFILE2) -M $(TOPLVL)/common/mapping -o report.html; \
 
 bump:
 	if [[ -e package.yml ]]; then \
 		python /usr/share/ypkg/ybump.py package.yml; \
 	else \
 		$(TOPLVL)/common/Scripts/pbump.py pspec.xml; \
 	fi;
 
 convert:
 	$(TOPLVL)/common/Scripts/yconvert.py pspec.xml;
 
 clean:
 	if [[ `ls *.eopkg` ]]; then \
 		rm *.eopkg -fv;  \
 	fi;
 
 pull:
 	git pull --rebase
 
 publish:
 	git tag $(SIGNTAG) -a -m "Publish $(TAG)" $(TAG)
 	git push --all
 	git push --tags
 	ssh build@solus-project.com build "$(SOURCE)" "$(TAG)"
 
 republish:
 	ssh build@solus-project.com build "$(SOURCE)" "$(TAG)"
 
 help:
 	@echo "build     - Build the current package"
 	@echo "bump      - Bump current release"
 	@echo "convert   - Convert pspec to package.yml"
 	@echo "cvecheck  - Check package for CVEs"
 	@echo "clean     - Clean current tree"
 	@echo "republish - Rebuild existing tag"
 	@echo "publish   - Tag and publish a release"
 	@echo "pull      - Pull/rebase latest changes"
 
 
 .PHONY:
 	complete
diff --git a/README.md b/README.md
index 2beb139..cb2f6aa 100644
--- a/README.md
+++ b/README.md
@@ -1,70 +1,65 @@
 Getting setup
 ------------
 
     git clone https://git.solus-project.com/common
     ln -sv common/Makefile.common .
     ln -sv common/Makefile.toplevel Makefile
     ln -sv common/Makefile.iso .
 
 Cloning all repositories
 ---------------------
 
     # This may take some time.
     make clone
 
 Updating all repositories
 -----------------------
 
     # This may take some time.
     make pull
 
 Building a package
 ----------------
 
-    # Ensure evobuild is setup..
+    # Ensure solbuild is setup..
     cd $somepkg
     make
 
 Submitting a build
 -----------------
 Submission is only possible for maintainers. As a maintainer you may freely
 push to your package(s) and initiate builds for them, which will be pushed to
 the unstable repository. You can watch builds at the [Solus Package Build Status Page](https://build.solus-project.com/)
 
 If you're submitting a `package.yml` build, ensure you also commit the `pspec_$ARCH.xml`
 file, as builds are created from git tags.
 
     cd $somepkg
     make publish
 
 Maintainership
 -------------
 Note that the infrastructure (including git pushes) is entirely locked
 to your public key. Pushing changes is not possible unless you have maintainer
 access. The same is also true of `make publish`.
 
 To request maintainer rights for a repository, it is expected that some level
 of contribution/maintenance has already happened by way of testing/patching, and
 there is reasonable trust demonstrated to "hand the keys" over to a repository.
 
 Currently, the request mechanism is to [email ikey](mailto:root@solus-project.com), or [catch him on IRC](irc://irc.freenode.net/#Solus-Dev)
 Bluntly put, it is far easier to grant access to active community members than those
 unknown to the project.
 
 Finally, note that the management reserve the right to revoke access at any time,
 in order to preserve project safety and integrity.
 
-evobuild/setup
+solbuild/setup
 -------------
 
-Solus users will have evobuild already available. *All* builds are performed in
-the unstable repository, so `unstable-x86_64` is the default build profile. If
-evobuild emits the following warning, you will need to initialise the profile:
+Install `solbuild` from the main repository.. *All* builds are performed in
+the unstable repository, so `unstable-x86_64` is the default build profile.
 
-    Building $pkg for unstable-x86_64
-    Did you forget to init unstable-x86_64 profile?
+Install `solbuild-config-unstable` to lock builds to the unstable repository.
 
-This can be remedied as follows (note this may take some time depending on your
-connection)
-
-    sudo evobuild init -p unstable-x86_64
+See `man solbuild` for further details.