diff --git a/zshrc b/zshrc
index c64b5cc..31bcc83 100644
--- a/zshrc
+++ b/zshrc
@@ -182,7 +182,7 @@ which gpg2 &>/dev/null && alias gpg=gpg2
 make() {
 	case "$PWD" in
 		# pkgsrc needs bmake and does not like MAKEFLAGS including -j.
-		*/pkgsrc | */pkgsrc/*)
+		*/pkgsrc*)
 			MAKEFLAGS= =$(__find_command bmake make) $@
 			;;
 		*)
@@ -193,6 +193,15 @@ make() {
 
 alias tmux="tmux -f $XDG_CONFIG_HOME/tmux/tmux.conf"
 
+if which fossil &>/dev/null; then
+	alias fsl="fossil"
+	alias fsls="fossil status"
+
+	fsld() {
+		fossil diff "$@" | vim -R -
+	}
+fi
+
 # pkgsrc does not like MAKEFLAGS including -j
 which pkg_chk &>/dev/null && alias pkg_chk="MAKEFLAGS= pkg_chk"
 which pkg_rolling-replace &>/dev/null &&
@@ -206,7 +215,7 @@ alias gpg-ssh="SSH_AUTH_SOCK=$GNUPGHOME/S.gpg-agent.ssh ssh"
 alias gpg-ssh-add="SSH_AUTH_SOCK=$GNUPGHOME/S.gpg-agent.ssh ssh-add"
 alias gpg-sftp="SSH_AUTH_SOCK=$GNUPGHOME/S.gpg-agent.ssh sftp"
 
-__pw() {
+pwnk() {
 	local clipboard
 	if which pbcopy &>/dev/null; then
 		clipboard=pbcopy
@@ -219,8 +228,8 @@ __pw() {
 
 	cryptopassphrase $@ | tr -d '\n' | $clipboard
 }
-alias pw="__pw -k ~/.cryptopassphrase.key"
-alias pws="__pw -k ~/.cryptopassphrase-server.key"
+alias pw="pwnk -k ~/.cryptopassphrase.key"
+alias pws="pwnk -k ~/.cryptopassphrase-server.key"
 
 ixio() { curl -F 'f:1=<-' ix.io }
 0x0st() { curl -F'file=@-' https://0x0.st }