diff --git a/makefile b/makefile
index 9cc75ad..cd5a2da 100644
--- a/makefile
+++ b/makefile
@@ -15,13 +15,13 @@
 BOOTSTRAP = gcc make nload
 
 # Languages to install after bootstrap but before other packages
-LANGS = perl python
+LANGS = go perl python
 
 # Stuff we want pip to install
 PIPMODULES = ansible pew pythonz-bd
 
 # Set of packages we want to include in the distribution tarball
-MYTOOLS = emacs file-formula git htop joe nmap screen the_silver_searcher tree vim
+MYTOOLS = emacs file-formula git htop joe nmap screen socat the_silver_searcher tmux tree vim
 
 
 # ----------- Nothing below here should need changing ----------- #
@@ -36,6 +36,9 @@
 	@echo "Make sure you have write permission on the target directory!"
 	git clone https://github.com/Linuxbrew/brew.git ${TOOLSDIR}
 
+
+# Bootstrapping
+
 bootstrap-build:
 	@echo "Make sure you have the OS development tools installed!"
 	${BREW} install ${BOOTSTRAP}
@@ -44,7 +47,10 @@
 	cd ${INSTALLDIR} && mv -v ${TOOLS} ${TOOLS}-bootstrap-${DATESTAMP}
 	cd ${INSTALLDIR} && tar -czvf ${EXPORTDIR}/${TOOLS}-bootstrap-${DATESTAMP}.tar.gz ${TOOLS}-bootstrap-${DATESTAMP}
 
-full-build:
+
+# Full tools set
+
+full-build: openssl@1.1
 	@echo "Make sure the bootstrap is installed at ${TOOLSDIR}"
 	-sudo yum -y install autoconf automake perl
 	${BREW} install ${LANGS}
@@ -57,6 +63,15 @@
 	cd ${INSTALLDIR} && mv -v ${TOOLS} ${TOOLS}-${DATESTAMP}
 	cd ${INSTALLDIR} && tar -czvf ${EXPORTDIR}/${TOOLS}-${DATESTAMP}.tar.gz ${TOOLS}-${DATESTAMP}
 
+
+# Special cases and dependencies can go here
+
+openssl@1.1:
+	${BREW} install openssl@1.1 --without-test
+
+
+# Housekeeping
+
 tidyup:
 	${BREW} config
 	${BREW} prune