diff --git a/john/.footprint b/john/.footprint
index aa1169790..0f946899e 100644
--- a/john/.footprint
+++ b/john/.footprint
@@ -1,157 +1,283 @@
+drwxr-xr-x	root/root	etc/
+drwxr-xr-x	root/root	etc/john/
+-rw-r--r--	root/root	etc/john/john.conf
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
+-rwxr-xr-x	root/root	usr/bin/SIPdump
+lrwxrwxrwx	root/root	usr/bin/base64conv -> john
+-rwxr-xr-x	root/root	usr/bin/calc_stat
+-rwxr-xr-x	root/root	usr/bin/cprepair
+lrwxrwxrwx	root/root	usr/bin/dmg2john -> john
+-rwxr-xr-x	root/root	usr/bin/genmkvpwd
+lrwxrwxrwx	root/root	usr/bin/gpg2john -> john
+lrwxrwxrwx	root/root	usr/bin/hccap2john -> john
 -rwxr-xr-x	root/root	usr/bin/john
+lrwxrwxrwx	root/root	usr/bin/keepass2john -> john
+lrwxrwxrwx	root/root	usr/bin/keychain2john -> john
+lrwxrwxrwx	root/root	usr/bin/keyring2john -> john
+lrwxrwxrwx	root/root	usr/bin/keystore2john -> john
+lrwxrwxrwx	root/root	usr/bin/kwallet2john -> john
+-rwxr-xr-x	root/root	usr/bin/luks2john
+-rwxr-xr-x	root/root	usr/bin/mkvcalcproba
+lrwxrwxrwx	root/root	usr/bin/pfx2john -> john
+lrwxrwxrwx	root/root	usr/bin/putty2john -> john
+lrwxrwxrwx	root/root	usr/bin/pwsafe2john -> john
+lrwxrwxrwx	root/root	usr/bin/racf2john -> john
+lrwxrwxrwx	root/root	usr/bin/rar2john -> john
+-rwxr-xr-x	root/root	usr/bin/raw2dyna
+-rwxr-xr-x	root/root	usr/bin/relbench
+lrwxrwxrwx	root/root	usr/bin/ssh2john -> john
+-rwxr-xr-x	root/root	usr/bin/tgtsnarf
+lrwxrwxrwx	root/root	usr/bin/truecrypt_volume2john -> john
+-rwxr-xr-x	root/root	usr/bin/uaf2john
+lrwxrwxrwx	root/root	usr/bin/unafs -> john
+lrwxrwxrwx	root/root	usr/bin/undrop -> john
+lrwxrwxrwx	root/root	usr/bin/unique -> john
+lrwxrwxrwx	root/root	usr/bin/unshadow -> john
+-rwxr-xr-x	root/root	usr/bin/vncpcap2john
+-rwxr-xr-x	root/root	usr/bin/wpapcap2john
+lrwxrwxrwx	root/root	usr/bin/zip2john -> john
 drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/john/
 -rwxr-xr-x	root/root	usr/lib/john/1password2john.py
 -rw-r--r--	root/root	usr/lib/john/1password2john.pyc
--rwxr-xr-x	root/root	usr/lib/john/7z2john.py
--rw-r--r--	root/root	usr/lib/john/7z2john.pyc
--rwxr-xr-x	root/root	usr/lib/john/SIPdump
+-rwxr-xr-x	root/root	usr/lib/john/7z2john.pl
+-rwxr-xr-x	root/root	usr/lib/john/DPAPImk2john.py
+-rw-r--r--	root/root	usr/lib/john/DPAPImk2john.pyc
+-rwxr-xr-x	root/root	usr/lib/john/adxcsouf2john.py
+-rw-r--r--	root/root	usr/lib/john/adxcsouf2john.pyc
+-rwxr-xr-x	root/root	usr/lib/john/aem2john.py
+-rw-r--r--	root/root	usr/lib/john/aem2john.pyc
 -rwxr-xr-x	root/root	usr/lib/john/aix2john.pl
 -rwxr-xr-x	root/root	usr/lib/john/aix2john.py
 -rw-r--r--	root/root	usr/lib/john/aix2john.pyc
--rwxr-xr-x	root/root	usr/lib/john/alnum.chr
--rwxr-xr-x	root/root	usr/lib/john/alnumspace.chr
--rwxr-xr-x	root/root	usr/lib/john/alpha.chr
+-rwxr-xr-x	root/root	usr/lib/john/andotp2john.py
+-rw-r--r--	root/root	usr/lib/john/andotp2john.pyc
+-rwxr-xr-x	root/root	usr/lib/john/androidbackup2john.py
+-rw-r--r--	root/root	usr/lib/john/androidbackup2john.pyc
 -rwxr-xr-x	root/root	usr/lib/john/androidfde2john.py
 -rw-r--r--	root/root	usr/lib/john/androidfde2john.pyc
+-rwxr-xr-x	root/root	usr/lib/john/ansible2john.py
+-rw-r--r--	root/root	usr/lib/john/ansible2john.pyc
 -rwxr-xr-x	root/root	usr/lib/john/apex2john.py
 -rw-r--r--	root/root	usr/lib/john/apex2john.pyc
--rwxr-xr-x	root/root	usr/lib/john/ascii.chr
--rwxr-xr-x	root/root	usr/lib/john/base64conv
+-rwxr-xr-x	root/root	usr/lib/john/applenotes2john.py
+-rw-r--r--	root/root	usr/lib/john/applenotes2john.pyc
+-rwxr-xr-x	root/root	usr/lib/john/aruba2john.py
+-rw-r--r--	root/root	usr/lib/john/aruba2john.pyc
+-rwxr-xr-x	root/root	usr/lib/john/axcrypt2john.py
+-rw-r--r--	root/root	usr/lib/john/axcrypt2john.pyc
 -rwxr-xr-x	root/root	usr/lib/john/benchmark-unify
+-rwxr-xr-x	root/root	usr/lib/john/bestcrypt2john.py
+-rw-r--r--	root/root	usr/lib/john/bestcrypt2john.pyc
 -rwxr-xr-x	root/root	usr/lib/john/bitcoin2john.py
 -rw-r--r--	root/root	usr/lib/john/bitcoin2john.pyc
+-rwxr-xr-x	root/root	usr/lib/john/bitshares2john.py
+-rw-r--r--	root/root	usr/lib/john/bitshares2john.pyc
+-rwxr-xr-x	root/root	usr/lib/john/bitwarden2john.py
+-rw-r--r--	root/root	usr/lib/john/bitwarden2john.pyc
+-rwxr-xr-x	root/root	usr/lib/john/bks2john.py
+-rw-r--r--	root/root	usr/lib/john/bks2john.pyc
 -rwxr-xr-x	root/root	usr/lib/john/blockchain2john.py
 -rw-r--r--	root/root	usr/lib/john/blockchain2john.pyc
--rwxr-xr-x	root/root	usr/lib/john/calc_stat
+-rwxr-xr-x	root/root	usr/lib/john/ccache2john.py
+-rw-r--r--	root/root	usr/lib/john/ccache2john.pyc
 -rwxr-xr-x	root/root	usr/lib/john/cisco2john.pl
--rwxr-xr-x	root/root	usr/lib/john/cprepair
+-rwxr-xr-x	root/root	usr/lib/john/codepage.pl
 -rwxr-xr-x	root/root	usr/lib/john/cracf2john.py
 -rw-r--r--	root/root	usr/lib/john/cracf2john.pyc
--rwxr-xr-x	root/root	usr/lib/john/dictionary.rfc2865
--rwxr-xr-x	root/root	usr/lib/john/digits.chr
--rwxr-xr-x	root/root	usr/lib/john/dmg2john
+-rwxr-xr-x	root/root	usr/lib/john/dashlane2john.py
+-rw-r--r--	root/root	usr/lib/john/dashlane2john.pyc
+-rwxr-xr-x	root/root	usr/lib/john/deepsound2john.py
+-rwxr-xr-x	root/root	usr/lib/john/diskcryptor2john.py
+-rw-r--r--	root/root	usr/lib/john/diskcryptor2john.pyc
 -rwxr-xr-x	root/root	usr/lib/john/dmg2john.py
 -rw-r--r--	root/root	usr/lib/john/dmg2john.pyc
--rwxr-xr-x	root/root	usr/lib/john/dumb16.conf
--rwxr-xr-x	root/root	usr/lib/john/dumb32.conf
--rwxr-xr-x	root/root	usr/lib/john/dynamic.conf
--rwxr-xr-x	root/root	usr/lib/john/dynamic_flat_sse_formats.conf
 -rwxr-xr-x	root/root	usr/lib/john/ecryptfs2john.py
 -rw-r--r--	root/root	usr/lib/john/ecryptfs2john.pyc
--rwxr-xr-x	root/root	usr/lib/john/efs2john.py
--rw-r--r--	root/root	usr/lib/john/efs2john.pyc
+-rwxr-xr-x	root/root	usr/lib/john/ejabberd2john.py
+-rw-r--r--	root/root	usr/lib/john/ejabberd2john.pyc
+-rwxr-xr-x	root/root	usr/lib/john/electrum2john.py
+-rw-r--r--	root/root	usr/lib/john/electrum2john.pyc
 -rwxr-xr-x	root/root	usr/lib/john/encfs2john.py
 -rw-r--r--	root/root	usr/lib/john/encfs2john.pyc
+-rwxr-xr-x	root/root	usr/lib/john/enpass2john.py
+-rw-r--r--	root/root	usr/lib/john/enpass2john.pyc
+-rwxr-xr-x	root/root	usr/lib/john/ethereum2john.py
+-rw-r--r--	root/root	usr/lib/john/ethereum2john.pyc
+-rwxr-xr-x	root/root	usr/lib/john/filezilla2john.py
+-rw-r--r--	root/root	usr/lib/john/filezilla2john.pyc
+-rwxr-xr-x	root/root	usr/lib/john/fuzz_option.pl
+-rwxr-xr-x	root/root	usr/lib/john/geli2john.py
+-rw-r--r--	root/root	usr/lib/john/geli2john.pyc
 -rwxr-xr-x	root/root	usr/lib/john/genincstats.rb
--rwxr-xr-x	root/root	usr/lib/john/genmkvpwd
--rwxr-xr-x	root/root	usr/lib/john/gpg2john
--rwxr-xr-x	root/root	usr/lib/john/hccap2john
+-rwxr-xr-x	root/root	usr/lib/john/hccapx2john.py
+-rw-r--r--	root/root	usr/lib/john/hccapx2john.pyc
 -rwxr-xr-x	root/root	usr/lib/john/hextoraw.pl
 -rwxr-xr-x	root/root	usr/lib/john/htdigest2john.py
 -rw-r--r--	root/root	usr/lib/john/htdigest2john.pyc
+-rwxr-xr-x	root/root	usr/lib/john/ibmiscanner2john.py
+-rw-r--r--	root/root	usr/lib/john/ibmiscanner2john.pyc
 -rwxr-xr-x	root/root	usr/lib/john/ikescan2john.py
 -rw-r--r--	root/root	usr/lib/john/ikescan2john.pyc
 -rwxr-xr-x	root/root	usr/lib/john/ios7tojohn.pl
--rwxr-xr-x	root/root	usr/lib/john/john
--rwxr-xr-x	root/root	usr/lib/john/john.bash_completion
--rwxr-xr-x	root/root	usr/lib/john/john.conf
--rwxr-xr-x	root/root	usr/lib/john/john.local.conf
--rwxr-xr-x	root/root	usr/lib/john/john.zsh_completion
+-rwxr-xr-x	root/root	usr/lib/john/itunes_backup2john.pl
+-rwxr-xr-x	root/root	usr/lib/john/iwork2john.py
+-rw-r--r--	root/root	usr/lib/john/iwork2john.pyc
 -rwxr-xr-x	root/root	usr/lib/john/kdcdump2john.py
 -rw-r--r--	root/root	usr/lib/john/kdcdump2john.pyc
--rwxr-xr-x	root/root	usr/lib/john/keepass2john
--rwxr-xr-x	root/root	usr/lib/john/keychain2john
 -rwxr-xr-x	root/root	usr/lib/john/keychain2john.py
 -rw-r--r--	root/root	usr/lib/john/keychain2john.pyc
--rwxr-xr-x	root/root	usr/lib/john/keyring2john
--rwxr-xr-x	root/root	usr/lib/john/keystore2john
+-rwxr-xr-x	root/root	usr/lib/john/keyring2john.py
+-rw-r--r--	root/root	usr/lib/john/keyring2john.pyc
 -rwxr-xr-x	root/root	usr/lib/john/keystore2john.py
 -rw-r--r--	root/root	usr/lib/john/keystore2john.pyc
+-rwxr-xr-x	root/root	usr/lib/john/kirbi2john.py
+-rw-r--r--	root/root	usr/lib/john/kirbi2john.pyc
 -rwxr-xr-x	root/root	usr/lib/john/known_hosts2john.py
 -rw-r--r--	root/root	usr/lib/john/known_hosts2john.pyc
--rwxr-xr-x	root/root	usr/lib/john/korelogic.conf
--rwxr-xr-x	root/root	usr/lib/john/kwallet2john
+-rwxr-xr-x	root/root	usr/lib/john/krb2john.py
+-rw-r--r--	root/root	usr/lib/john/krb2john.pyc
 -rwxr-xr-x	root/root	usr/lib/john/kwallet2john.py
 -rw-r--r--	root/root	usr/lib/john/kwallet2john.pyc
--rwxr-xr-x	root/root	usr/lib/john/lanman.chr
--rwxr-xr-x	root/root	usr/lib/john/latin1.chr
+-rwxr-xr-x	root/root	usr/lib/john/lastpass2john.py
+-rw-r--r--	root/root	usr/lib/john/lastpass2john.pyc
 -rwxr-xr-x	root/root	usr/lib/john/ldif2john.pl
 -rwxr-xr-x	root/root	usr/lib/john/leet.pl
+-rwxr-xr-x	root/root	usr/lib/john/libreoffice2john.py
+-rw-r--r--	root/root	usr/lib/john/libreoffice2john.pyc
 -rwxr-xr-x	root/root	usr/lib/john/lion2john-alt.pl
 -rwxr-xr-x	root/root	usr/lib/john/lion2john.pl
--rwxr-xr-x	root/root	usr/lib/john/lm_ascii.chr
 -rwxr-xr-x	root/root	usr/lib/john/lotus2john.py
 -rw-r--r--	root/root	usr/lib/john/lotus2john.pyc
--rwxr-xr-x	root/root	usr/lib/john/lower.chr
--rwxr-xr-x	root/root	usr/lib/john/lowernum.chr
--rwxr-xr-x	root/root	usr/lib/john/lowerspace.chr
--rwxr-xr-x	root/root	usr/lib/john/luks2john
+-rwxr-xr-x	root/root	usr/lib/john/luks2john.py
+-rw-r--r--	root/root	usr/lib/john/luks2john.pyc
+-rwxr-xr-x	root/root	usr/lib/john/mac2john-alt.py
+-rw-r--r--	root/root	usr/lib/john/mac2john-alt.pyc
+-rwxr-xr-x	root/root	usr/lib/john/mac2john.py
+-rw-r--r--	root/root	usr/lib/john/mac2john.pyc
 -rwxr-xr-x	root/root	usr/lib/john/mailer
--rwxr-xr-x	root/root	usr/lib/john/makechr
 -rwxr-xr-x	root/root	usr/lib/john/mcafee_epo2john.py
 -rw-r--r--	root/root	usr/lib/john/mcafee_epo2john.pyc
--rwxr-xr-x	root/root	usr/lib/john/mkvcalcproba
--rwxr-xr-x	root/root	usr/lib/john/ml2john.py
--rw-r--r--	root/root	usr/lib/john/ml2john.pyc
+-rwxr-xr-x	root/root	usr/lib/john/monero2john.py
+-rw-r--r--	root/root	usr/lib/john/monero2john.pyc
+-rwxr-xr-x	root/root	usr/lib/john/money2john.py
+-rw-r--r--	root/root	usr/lib/john/money2john.pyc
 -rwxr-xr-x	root/root	usr/lib/john/mozilla2john.py
 -rw-r--r--	root/root	usr/lib/john/mozilla2john.pyc
+-rwxr-xr-x	root/root	usr/lib/john/multibit2john.py
+-rw-r--r--	root/root	usr/lib/john/multibit2john.pyc
+-rwxr-xr-x	root/root	usr/lib/john/neo2john.py
+-rw-r--r--	root/root	usr/lib/john/neo2john.pyc
 -rwxr-xr-x	root/root	usr/lib/john/netntlm.pl
 -rwxr-xr-x	root/root	usr/lib/john/netscreen.py
 -rw-r--r--	root/root	usr/lib/john/netscreen.pyc
--rwxr-xr-x	root/root	usr/lib/john/odf2john.py
--rw-r--r--	root/root	usr/lib/john/odf2john.pyc
 -rwxr-xr-x	root/root	usr/lib/john/office2john.py
 -rw-r--r--	root/root	usr/lib/john/office2john.pyc
 -rwxr-xr-x	root/root	usr/lib/john/openbsd_softraid2john.py
 -rw-r--r--	root/root	usr/lib/john/openbsd_softraid2john.pyc
 -rwxr-xr-x	root/root	usr/lib/john/openssl2john.py
 -rw-r--r--	root/root	usr/lib/john/openssl2john.pyc
+-rwxr-xr-x	root/root	usr/lib/john/padlock2john.py
+-rw-r--r--	root/root	usr/lib/john/padlock2john.pyc
 -rwxr-xr-x	root/root	usr/lib/john/pass_gen.pl
--rwxr-xr-x	root/root	usr/lib/john/password.lst
 -rwxr-xr-x	root/root	usr/lib/john/pcap2john.py
 -rw-r--r--	root/root	usr/lib/john/pcap2john.pyc
--rwxr-xr-x	root/root	usr/lib/john/pdf2john.py
--rw-r--r--	root/root	usr/lib/john/pdf2john.pyc
--rwxr-xr-x	root/root	usr/lib/john/pfx2john
--rwxr-xr-x	root/root	usr/lib/john/putty2john
--rwxr-xr-x	root/root	usr/lib/john/pwsafe2john
--rwxr-xr-x	root/root	usr/lib/john/racf2john
+-rwxr-xr-x	root/root	usr/lib/john/pdf2john.pl
+-rwxr-xr-x	root/root	usr/lib/john/pem2john.py
+-rw-r--r--	root/root	usr/lib/john/pem2john.pyc
+-rwxr-xr-x	root/root	usr/lib/john/pfx2john.py
+-rw-r--r--	root/root	usr/lib/john/pfx2john.pyc
+-rwxr-xr-x	root/root	usr/lib/john/pgpdisk2john.py
+-rw-r--r--	root/root	usr/lib/john/pgpdisk2john.pyc
+-rwxr-xr-x	root/root	usr/lib/john/pgpsda2john.py
+-rw-r--r--	root/root	usr/lib/john/pgpsda2john.pyc
+-rwxr-xr-x	root/root	usr/lib/john/pgpwde2john.py
+-rw-r--r--	root/root	usr/lib/john/pgpwde2john.pyc
+-rwxr-xr-x	root/root	usr/lib/john/potcheck.pl
+-rwxr-xr-x	root/root	usr/lib/john/prosody2john.py
+-rw-r--r--	root/root	usr/lib/john/prosody2john.pyc
+-rwxr-xr-x	root/root	usr/lib/john/ps_token2john.py
+-rw-r--r--	root/root	usr/lib/john/ps_token2john.pyc
+-rwxr-xr-x	root/root	usr/lib/john/pse2john.py
+-rw-r--r--	root/root	usr/lib/john/pse2john.pyc
+-rwxr-xr-x	root/root	usr/lib/john/pwsafe2john.py
+-rw-r--r--	root/root	usr/lib/john/pwsafe2john.pyc
 -rwxr-xr-x	root/root	usr/lib/john/radius2john.pl
--rwxr-xr-x	root/root	usr/lib/john/rar2john
--rwxr-xr-x	root/root	usr/lib/john/raw2dyna
--rwxr-xr-x	root/root	usr/lib/john/regex_alphabets.conf
--rwxr-xr-x	root/root	usr/lib/john/relbench
--rwxr-xr-x	root/root	usr/lib/john/repeats16.conf
--rwxr-xr-x	root/root	usr/lib/john/repeats32.conf
+-rwxr-xr-x	root/root	usr/lib/john/radius2john.py
+-rw-r--r--	root/root	usr/lib/john/radius2john.pyc
 -rwxr-xr-x	root/root	usr/lib/john/rexgen2rules.pl
+-rwxr-xr-x	root/root	usr/lib/john/rulestack.pl
 -rwxr-xr-x	root/root	usr/lib/john/sap2john.pl
 -rwxr-xr-x	root/root	usr/lib/john/sha-dump.pl
 -rwxr-xr-x	root/root	usr/lib/john/sha-test.pl
+-rwxr-xr-x	root/root	usr/lib/john/signal2john.py
+-rw-r--r--	root/root	usr/lib/john/signal2john.pyc
 -rwxr-xr-x	root/root	usr/lib/john/sipdump2john.py
 -rw-r--r--	root/root	usr/lib/john/sipdump2john.pyc
--rwxr-xr-x	root/root	usr/lib/john/ssh2john
--rwxr-xr-x	root/root	usr/lib/john/ssh2sshng.py
--rw-r--r--	root/root	usr/lib/john/ssh2sshng.pyc
--rwxr-xr-x	root/root	usr/lib/john/sshng2john.py
--rw-r--r--	root/root	usr/lib/john/sshng2john.pyc
--rwxr-xr-x	root/root	usr/lib/john/stats
+-rwxr-xr-x	root/root	usr/lib/john/ssh2john.py
+-rw-r--r--	root/root	usr/lib/john/ssh2john.pyc
+-rwxr-xr-x	root/root	usr/lib/john/sspr2john.py
+-rw-r--r--	root/root	usr/lib/john/sspr2john.pyc
+-rwxr-xr-x	root/root	usr/lib/john/staroffice2john.py
+-rw-r--r--	root/root	usr/lib/john/staroffice2john.pyc
 -rwxr-xr-x	root/root	usr/lib/john/strip2john.py
 -rw-r--r--	root/root	usr/lib/john/strip2john.pyc
--rwxr-xr-x	root/root	usr/lib/john/sxc2john.py
--rw-r--r--	root/root	usr/lib/john/sxc2john.pyc
--rwxr-xr-x	root/root	usr/lib/john/tgtsnarf
--rwxr-xr-x	root/root	usr/lib/john/truecrypt_volume2john
--rwxr-xr-x	root/root	usr/lib/john/uaf2john
--rwxr-xr-x	root/root	usr/lib/john/unafs
--rwxr-xr-x	root/root	usr/lib/john/undrop
--rwxr-xr-x	root/root	usr/lib/john/unique
--rwxr-xr-x	root/root	usr/lib/john/unshadow
--rwxr-xr-x	root/root	usr/lib/john/upper.chr
--rwxr-xr-x	root/root	usr/lib/john/uppernum.chr
--rwxr-xr-x	root/root	usr/lib/john/utf8.chr
--rwxr-xr-x	root/root	usr/lib/john/vncpcap2john
--rwxr-xr-x	root/root	usr/lib/john/wpapcap2john
--rwxr-xr-x	root/root	usr/lib/john/zip2john
+-rwxr-xr-x	root/root	usr/lib/john/telegram2john.py
+-rw-r--r--	root/root	usr/lib/john/telegram2john.pyc
+-rwxr-xr-x	root/root	usr/lib/john/tezos2john.py
+-rw-r--r--	root/root	usr/lib/john/tezos2john.pyc
+-rwxr-xr-x	root/root	usr/lib/john/truecrypt2john.py
+-rw-r--r--	root/root	usr/lib/john/truecrypt2john.pyc
+-rwxr-xr-x	root/root	usr/lib/john/unrule.pl
+-rwxr-xr-x	root/root	usr/lib/john/vdi2john.pl
+-rwxr-xr-x	root/root	usr/lib/john/vmx2john.py
+-rw-r--r--	root/root	usr/lib/john/vmx2john.pyc
+drwxr-xr-x	root/root	usr/share/
+drwxr-xr-x	root/root	usr/share/bash-completion/
+drwxr-xr-x	root/root	usr/share/bash-completion/completions/
+-rw-r--r--	root/root	usr/share/bash-completion/completions/john
+drwxr-xr-x	root/root	usr/share/john/
+-rw-r--r--	root/root	usr/share/john/alnum.chr
+-rw-r--r--	root/root	usr/share/john/alnumspace.chr
+-rw-r--r--	root/root	usr/share/john/alpha.chr
+-rw-r--r--	root/root	usr/share/john/ascii.chr
+-rw-r--r--	root/root	usr/share/john/dictionary.rfc2865
+-rw-r--r--	root/root	usr/share/john/digits.chr
+-rw-r--r--	root/root	usr/share/john/dumb16.conf
+-rw-r--r--	root/root	usr/share/john/dumb32.conf
+-rw-r--r--	root/root	usr/share/john/dynamic.conf
+-rw-r--r--	root/root	usr/share/john/dynamic_disabled.conf
+-rw-r--r--	root/root	usr/share/john/dynamic_flat_sse_formats.conf
+-rw-r--r--	root/root	usr/share/john/hybrid.conf
+-rw-r--r--	root/root	usr/share/john/john.conf
+-rw-r--r--	root/root	usr/share/john/korelogic.conf
+-rw-r--r--	root/root	usr/share/john/lanman.chr
+-rw-r--r--	root/root	usr/share/john/latin1.chr
+-rw-r--r--	root/root	usr/share/john/lm_ascii.chr
+-rw-r--r--	root/root	usr/share/john/lower.chr
+-rw-r--r--	root/root	usr/share/john/lowernum.chr
+-rw-r--r--	root/root	usr/share/john/lowerspace.chr
+-rw-r--r--	root/root	usr/share/john/password.lst
+-rw-r--r--	root/root	usr/share/john/regex_alphabets.conf
+-rw-r--r--	root/root	usr/share/john/repeats16.conf
+-rw-r--r--	root/root	usr/share/john/repeats32.conf
+drwxr-xr-x	root/root	usr/share/john/rules/
+-rw-r--r--	root/root	usr/share/john/rules/InsidePro-PasswordsPro.rule
+-rw-r--r--	root/root	usr/share/john/rules/T0XlC-insert_top_100_passwords_1_G.rule
+-rw-r--r--	root/root	usr/share/john/rules/T0XlC.rule
+-rw-r--r--	root/root	usr/share/john/rules/T0XlCv1.rule
+-rw-r--r--	root/root	usr/share/john/rules/best64.rule
+-rw-r--r--	root/root	usr/share/john/rules/d3ad0ne.rule
+-rw-r--r--	root/root	usr/share/john/rules/dive.rule
+-rw-r--r--	root/root	usr/share/john/rules/passphrase-rule1.rule
+-rw-r--r--	root/root	usr/share/john/rules/passphrase-rule2.rule
+-rw-r--r--	root/root	usr/share/john/rules/rockyou-30000.rule
+-rw-r--r--	root/root	usr/share/john/rules/specific.rule
+-rw-r--r--	root/root	usr/share/john/stats
+-rw-r--r--	root/root	usr/share/john/upper.chr
+-rw-r--r--	root/root	usr/share/john/uppernum.chr
+-rw-r--r--	root/root	usr/share/john/utf8.chr
+drwxr-xr-x	root/root	usr/share/zsh/
+drwxr-xr-x	root/root	usr/share/zsh/site-functions/
+-rw-r--r--	root/root	usr/share/zsh/site-functions/_john
diff --git a/john/.signature b/john/.signature
index 74d60451c..e8d50a7d2 100644
--- a/john/.signature
+++ b/john/.signature
@@ -1,6 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/dIyRx0Uvk3/YLUTk0F2mj+ac102LVfn8Qb8AKSFzjE4czNU+5W5I9uuchKyWwIbUA/06d86Olc6BpB7h0FjDgw=
-SHA256 (Pkgfile) = 3092f93d33f55e937e304a36781d7774db77ca136ae9b2f02c4e95814db8e920
-SHA256 (.footprint) = de95804b001eda8fc6a8f1f8a35f7c3451303bfb34de55941fefbf56e8b71412
-SHA256 (john-1.8.0-jumbo-1.tar.xz) = bac93d025995a051f055adbd7ce2f1975676cac6c74a6c7a3ee4cfdd9c160923
-SHA256 (gcc5.patch) = c84d53f4e2b5c15c9ab83aea05d72a7e1492e4f0cb547e0047aa91458851aee5
+RWSE3ohX2g5d/TdKSlYqLNf1c2ZeoXO3wP+GnIrIGSCsP8RXQf7baLPbGtSJ+63VOJ1bQ25h3LJOc8Vkui1jH+KqAxUuOBXDbQk=
+SHA256 (Pkgfile) = 6b403df28c970b34624a1cb808f8a651e6507f61084e990ae291f04d891c080a
+SHA256 (.footprint) = 5fbd03f161d89edd1ed09b04c4de628bbc9390fbff39653842d9b8c182ef369b
+SHA256 (john-1.9.0-jumbo-1.tar.xz) = f5d123f82983c53d8cc598e174394b074be7a77756f5fb5ed8515918c81e7f3b
diff --git a/john/Pkgfile b/john/Pkgfile
index 626c99e5c..702a57655 100644
--- a/john/Pkgfile
+++ b/john/Pkgfile
@@ -4,30 +4,59 @@
 # Depends on:  libpcap python
 
 name=john
-version=1.8.0-jumbo-1
-release=2
-source=(http://www.openwall.com/$name/j/$name-$version.tar.xz
-	gcc5.patch)
+version=1.9.0-jumbo-1
+release=1
+source=(https://www.openwall.com/$name/k/$name-$version.tar.xz)
 
 build() {
   cd $name-$version/src
 
-  sed -i 's|/usr/libexec|/usr/lib|g' params.h
+  sed 's|$prefix/bin|/usr/lib/john|' -i configure.ac
+  autoreconf -fiv
   
-  # fix compilation with gcc 5.x
-  patch -p2 -i $SRC/gcc5.patch
-
   CONFIG_SHELL=/bin/bash \
   ./configure --prefix=/usr CFLAGS="${CFLAGS}"
   
   make
+  cd ..
 
-  install -d $PKG/usr/lib/$name
-  install -m 0755 -t $PKG/usr/lib/$name ../run/*
+  # config
+  install -Dm 644 run/john.conf -t "$PKG/etc/john"
+  install -Dm 644 run/*.conf -t "$PKG/usr/share/john"
 
-  install -d $PKG/usr/bin
-  echo -e '#!/bin/sh\n/usr/lib/john/john "$@"\n' > $PKG/usr/bin/john
-  chmod 0755 $PKG/usr/bin/john
+  # opencl
+  #install -Dm 644 run/kernels/* -t "$PKG/usr/share/john/kernels"
 
-  /usr/bin/python -mcompileall $PKG
+  # completion
+  install -Dm 644 run/john.bash_completion "$PKG/usr/share/bash-completion/completions/john"
+  install -Dm 644 run/john.zsh_completion "$PKG/usr/share/zsh/site-functions/_john"
+
+  # binaries
+  install -Dm 755 run/john -t "$PKG/usr/bin"
+  local john_bins=(calc_stat cprepair  genmkvpwd  luks2john.py    mkvcalcproba raw2dyna \
+                   relbench  tgtsnarf  uaf2john   wpapcap2john vncpcap2john SIPdump)
+  for bin in "${john_bins[@]}"; do
+    install -Dm 755 "run/${bin}" "$PKG/usr/bin/${bin/.py/}"
+  done
+
+  # scripts
+  install -Dm 755 run/*.py run/*.pl run/*.rb run/{mailer,benchmark-unify} -t "$PKG/usr/lib/john"
+
+  # data
+  install -Dm 644 run/*.chr run/*.lst run/dictionary* run/stats -t "$PKG/usr/share/john"
+  install -Dm 644 run/rules/* -t "$PKG/usr/share/john/rules"
+
+  # syminks
+  cd "$PKG/usr/bin"
+  local john_links=(base64conv    dmg2john       gpg2john      hccap2john    \
+                    keepass2john  keychain2john  keyring2john  keystore2john \
+                    kwallet2john  pfx2john       putty2john    pwsafe2john   \
+                    racf2john     rar2john       ssh2john      unique        \
+                    unshadow      zip2john       unafs         undrop        \
+                    truecrypt_volume2john)
+  for link in "${john_links[@]}"; do
+    ln -s john ${link}
+  done
+
+  find $PKG -type f ! -name deepsound2john.py -exec /usr/bin/python -mcompileall {} \+
 }
diff --git a/john/gcc5.patch b/john/gcc5.patch
deleted file mode 100644
index f2a798495..000000000
--- a/john/gcc5.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From e2e868db3e153b3f959e119a51703d4afb99c624 Mon Sep 17 00:00:00 2001
-From: magnum <john.magnum@hushmail.com>
-Date: Wed, 13 May 2015 12:05:00 +0200
-Subject: [PATCH] Add another solution to #1093. This make it possible to build
- using gcc 5 without --std=gnu89 (although I kept the latter for now). See
- also #1250.
-
----
- src/DES_bs_b.c |  3 +++
- src/MD5_std.c  | 12 ++++++++++++
- 2 files changed, 15 insertions(+)
-
-diff --git a/src/DES_bs_b.c b/src/DES_bs_b.c
-index 306b4e4..18c9235 100644
---- a/src/DES_bs_b.c
-+++ b/src/DES_bs_b.c
-@@ -1272,6 +1272,9 @@ static MAYBE_INLINE void DES_bs_finalize_keys(void)
- #endif
- 
- #if DES_bs_mt
-+#if __GNUC__ >= 5
-+extern
-+#endif
- MAYBE_INLINE void DES_bs_set_salt_for_thread(int t, unsigned int salt)
- #else
- void DES_bs_set_salt(ARCH_WORD salt)
-diff --git a/src/MD5_std.c b/src/MD5_std.c
-index 6bdcd35..1eec9b4 100644
---- a/src/MD5_std.c
-+++ b/src/MD5_std.c
-@@ -496,9 +496,15 @@ extern void MD5_body(MD5_word x[15], MD5_word out[4]);
- #if MD5_std_mt
- #define MD5_body(x, out) \
- 	MD5_body_for_thread(t, x, out)
-+#if __GNUC__ >= 5
-+extern
-+#endif
- MAYBE_INLINE_BODY void MD5_body_for_thread(int t,
- 	MD5_word x[15], MD5_word out[4])
- #else
-+#if __GNUC__ >= 5
-+extern
-+#endif
- MAYBE_INLINE_BODY void MD5_body(MD5_word x[15], MD5_word out[4])
- #endif
- {
-@@ -595,10 +601,16 @@ MAYBE_INLINE_BODY void MD5_body(MD5_word x[15], MD5_word out[4])
- #if MD5_std_mt
- #define MD5_body(x0, x1, out0, out1) \
- 	MD5_body_for_thread(t, x0, x1, out0, out1)
-+#if __GNUC__ >= 5
-+extern
-+#endif
- MAYBE_INLINE_BODY void MD5_body_for_thread(int t,
- 	MD5_word x0[15], MD5_word x1[15],
- 	MD5_word out0[4], MD5_word out1[4])
- #else
-+#if __GNUC__ >= 5
-+extern
-+#endif
- MAYBE_INLINE_BODY void MD5_body(MD5_word x0[15], MD5_word x1[15],
- 	MD5_word out0[4], MD5_word out1[4])
- #endif