diff --git a/.bashrc b/.bashrc
index 1a5c9e4..60ae0e7 100644
--- a/.bashrc
+++ b/.bashrc
@@ -13,7 +13,7 @@ HISTTIMEFORMAT="%d/%m/%y %H:%M:%S  "
 history -r
 
 # Set the prompts.
-if (( ${BASH_VERSINFO[0]} == 4 )); then
+if (( ${BASH_VERSINFO[0]} >= 4 )); then
   export PROMPT_DIRTRIM=2
   if (( $(id -u) == 0 )); then
     PS1="[\[\033[1;31m\]\u\[\033[0m\]@\h] \w ->"
@@ -39,6 +39,7 @@ if [ "$_PLATFORM" = "Linux" ]; then
   hash ls >/dev/null 2>&1 && alias ls='ls -bFv --color=auto'
   hash lynx >/dev/null 2>&1 && alias lynx='lynx -cfg=~/.lynx.cfg -lss=~/.lynx.lss'
   hash minicom >/dev/null 2>&1 && alias minicom='minicom -m -c on'
+  hash mkpasswd >/dev/null 2>&1 && alias pwgen='mkpasswd -m sha512crypt'
   hash pine >/dev/null 2>&1 && alias pine='pine -p "{mail.open-source.co.uk/Service=IMAP/User=darren@afterdark.org.uk/TLS/NoValidate-Cert/NoRsh}.pinerc"'
   hash pinfo >/dev/null 2>&1 && alias info='pinfo'
   hash ping >/dev/null 2>&1 && alias ping='ping -b'
diff --git a/.ssh/config b/.ssh/config
index 75aa467..d691412 100644
--- a/.ssh/config
+++ b/.ssh/config
@@ -17,18 +17,29 @@ Host leela leela.open-source.co.uk
   HostName			leela.open-source.co.uk
   Port				9922
 
+Host amy amy.open-source.co.uk
+  ForwardAgent			yes
+  HostName			amy.open-source.co.uk
+  Port				9922
+
+Host hermes hermes.open-source.co.uk
+  ForwardAgent			yes
+  HostName			hermes.open-source.co.uk
+  Port				9922
+
 Host slackware.uk
   ForwardAgent			yes
   Hostname			slackware.uk
   Port				9922
 
 Host full-* build-* clone-*
+  ForwardAgent			yes
   User				root
 
-Host slackware.uk
+Host backupnas
   ForwardAgent			yes
-  Hostname			slackware.uk
-  Port				9922
+  Hostname			helium.rainsbrook.co.uk
+  Port				2048
 
 Host *
   # AddKeysToAgent		yes