61 files changed, 63 insertions, 63 deletions

diff --git a/Makefile b/Makefile
index 62dc927..6db74cf 100644
--- a/Makefile
+++ b/Makefile
@@ -83,67 +83,67 @@ SUBHDR =\
 	libkeccak/util.h
 
 MAN3 =\
-	libkeccak_behex_lower.3\
-	libkeccak_behex_upper.3\
-	libkeccak_cshake_initialise.3\
-	libkeccak_cshake_suffix.3\
-	libkeccak_degeneralise_spec.3\
-	libkeccak_digest.3\
-	libkeccak_fast_digest.3\
-	libkeccak_fast_squeeze.3\
-	libkeccak_fast_update.3\
-	libkeccak_generalised_spec_initialise.3\
-	libkeccak_generalised_sum_fd.3\
-	libkeccak_hmac_copy.3\
-	libkeccak_hmac_create.3\
-	libkeccak_hmac_destroy.3\
-	libkeccak_hmac_digest.3\
-	libkeccak_hmac_duplicate.3\
-	libkeccak_hmac_fast_destroy.3\
-	libkeccak_hmac_fast_digest.3\
-	libkeccak_hmac_fast_free.3\
-	libkeccak_hmac_fast_update.3\
-	libkeccak_hmac_free.3\
-	libkeccak_hmac_initialise.3\
-	libkeccak_hmac_marshal.3\
-	libkeccak_hmac_reset.3\
-	libkeccak_hmac_set_key.3\
-	libkeccak_hmac_unmarshal.3\
-	libkeccak_hmac_update.3\
-	libkeccak_hmac_wipe.3\
-	libkeccak_keccaksum_fd.3\
-	libkeccak_rawshakesum_fd.3\
-	libkeccak_sha3sum_fd.3\
-	libkeccak_shakesum_fd.3\
-	libkeccak_simple_squeeze.3\
-	libkeccak_spec_check.3\
-	libkeccak_spec_cshake.3\
-	libkeccak_spec_rawshake.3\
-	libkeccak_spec_sha3.3\
-	libkeccak_spec_shake.3\
-	libkeccak_squeeze.3\
-	libkeccak_state_copy.3\
-	libkeccak_state_create.3\
-	libkeccak_state_destroy.3\
-	libkeccak_state_duplicate.3\
-	libkeccak_state_fast_destroy.3\
-	libkeccak_state_fast_free.3\
-	libkeccak_state_free.3\
-	libkeccak_state_initialise.3\
-	libkeccak_state_marshal.3\
-	libkeccak_state_reset.3\
-	libkeccak_state_unmarshal.3\
-	libkeccak_state_wipe.3\
-	libkeccak_state_wipe_message.3\
-	libkeccak_state_wipe_sponge.3\
-	libkeccak_unhex.3\
-	libkeccak_update.3\
-	libkeccak_zerocopy_chunksize.3\
-	libkeccak_zerocopy_digest.3\
-	libkeccak_zerocopy_update.3
+	man3/libkeccak_behex_lower.3\
+	man3/libkeccak_behex_upper.3\
+	man3/libkeccak_cshake_initialise.3\
+	man3/libkeccak_cshake_suffix.3\
+	man3/libkeccak_degeneralise_spec.3\
+	man3/libkeccak_digest.3\
+	man3/libkeccak_fast_digest.3\
+	man3/libkeccak_fast_squeeze.3\
+	man3/libkeccak_fast_update.3\
+	man3/libkeccak_generalised_spec_initialise.3\
+	man3/libkeccak_generalised_sum_fd.3\
+	man3/libkeccak_hmac_copy.3\
+	man3/libkeccak_hmac_create.3\
+	man3/libkeccak_hmac_destroy.3\
+	man3/libkeccak_hmac_digest.3\
+	man3/libkeccak_hmac_duplicate.3\
+	man3/libkeccak_hmac_fast_destroy.3\
+	man3/libkeccak_hmac_fast_digest.3\
+	man3/libkeccak_hmac_fast_free.3\
+	man3/libkeccak_hmac_fast_update.3\
+	man3/libkeccak_hmac_free.3\
+	man3/libkeccak_hmac_initialise.3\
+	man3/libkeccak_hmac_marshal.3\
+	man3/libkeccak_hmac_reset.3\
+	man3/libkeccak_hmac_set_key.3\
+	man3/libkeccak_hmac_unmarshal.3\
+	man3/libkeccak_hmac_update.3\
+	man3/libkeccak_hmac_wipe.3\
+	man3/libkeccak_keccaksum_fd.3\
+	man3/libkeccak_rawshakesum_fd.3\
+	man3/libkeccak_sha3sum_fd.3\
+	man3/libkeccak_shakesum_fd.3\
+	man3/libkeccak_simple_squeeze.3\
+	man3/libkeccak_spec_check.3\
+	man3/libkeccak_spec_cshake.3\
+	man3/libkeccak_spec_rawshake.3\
+	man3/libkeccak_spec_sha3.3\
+	man3/libkeccak_spec_shake.3\
+	man3/libkeccak_squeeze.3\
+	man3/libkeccak_state_copy.3\
+	man3/libkeccak_state_create.3\
+	man3/libkeccak_state_destroy.3\
+	man3/libkeccak_state_duplicate.3\
+	man3/libkeccak_state_fast_destroy.3\
+	man3/libkeccak_state_fast_free.3\
+	man3/libkeccak_state_free.3\
+	man3/libkeccak_state_initialise.3\
+	man3/libkeccak_state_marshal.3\
+	man3/libkeccak_state_reset.3\
+	man3/libkeccak_state_unmarshal.3\
+	man3/libkeccak_state_wipe.3\
+	man3/libkeccak_state_wipe_message.3\
+	man3/libkeccak_state_wipe_sponge.3\
+	man3/libkeccak_unhex.3\
+	man3/libkeccak_update.3\
+	man3/libkeccak_zerocopy_chunksize.3\
+	man3/libkeccak_zerocopy_digest.3\
+	man3/libkeccak_zerocopy_update.3
 
 MAN7 =\
-	libkeccak.7
+	man7/libkeccak.7
 
 
 all: libkeccak.a libkeccak.$(LIBEXT) test benchmark
@@ -208,9 +208,9 @@ uninstall:
 	-rm -f -- "$(DESTDIR)$(PREFIX)/lib/libkeccak.$(LIBMAJOREXT)"
 	-rm -f -- "$(DESTDIR)$(PREFIX)/lib/libkeccak.$(LIBEXT)"
 	-rm -f -- "$(DESTDIR)$(PREFIX)/lib/libkeccak.a"
-	-cd -- "$(DESTDIR)$(PREFIX)/include/" && rm -f $(SUBHDIR)
-	-cd -- "$(DESTDIR)$(MANPREFIX)/man3" && rm -f -- $(MAN3)
-	-cd -- "$(DESTDIR)$(MANPREFIX)/man7" && rm -f -- $(MAN7)
+	-cd -- "$(DESTDIR)$(PREFIX)/include/" && rm -f $(SUBHDR) libkeccak.h
+	-rmdir -- "$(DESTDIR)$(PREFIX)/include/libkeccak"
+	-cd -- "$(DESTDIR)$(MANPREFIX)" && rm -f -- $(MAN3) $(MAN7)
 	-rm -rf -- "$(DESTDIR)$(PREFIX)/share/licenses/libkeccak"
 
 clean:
diff --git a/README b/README
index 712f7fd..f2a9878 100644
--- a/README
+++ b/README
@@ -12,4 +12,4 @@ RATIONALE
 	and let it be bit-oriented.
 
 SEE ALSO
-	sha3sum, libblake(7), libsha2(7), libsha1(7)
+	sha3sum, libblake(7), libsha2(7), libsha1(7), libhashsum(7)
diff --git a/libkeccak_behex_lower.3 b/man3/libkeccak_behex_lower.3
index 2078790..2078790 100644
--- a/libkeccak_behex_lower.3
+++ b/man3/libkeccak_behex_lower.3
diff --git a/libkeccak_behex_upper.3 b/man3/libkeccak_behex_upper.3
index b5c67bb..b5c67bb 100644
--- a/libkeccak_behex_upper.3
+++ b/man3/libkeccak_behex_upper.3
diff --git a/libkeccak_cshake_initialise.3 b/man3/libkeccak_cshake_initialise.3
index a18f1bf..a18f1bf 100644
--- a/libkeccak_cshake_initialise.3
+++ b/man3/libkeccak_cshake_initialise.3
diff --git a/libkeccak_cshake_suffix.3 b/man3/libkeccak_cshake_suffix.3
index b390134..b390134 100644
--- a/libkeccak_cshake_suffix.3
+++ b/man3/libkeccak_cshake_suffix.3
diff --git a/libkeccak_degeneralise_spec.3 b/man3/libkeccak_degeneralise_spec.3
index e694147..e694147 100644
--- a/libkeccak_degeneralise_spec.3
+++ b/man3/libkeccak_degeneralise_spec.3
diff --git a/libkeccak_digest.3 b/man3/libkeccak_digest.3
index 90c76c5..90c76c5 100644
--- a/libkeccak_digest.3
+++ b/man3/libkeccak_digest.3
diff --git a/libkeccak_fast_digest.3 b/man3/libkeccak_fast_digest.3
index c4925e4..c4925e4 100644
--- a/libkeccak_fast_digest.3
+++ b/man3/libkeccak_fast_digest.3
diff --git a/libkeccak_fast_squeeze.3 b/man3/libkeccak_fast_squeeze.3
index 5be6cd6..5be6cd6 100644
--- a/libkeccak_fast_squeeze.3
+++ b/man3/libkeccak_fast_squeeze.3
diff --git a/libkeccak_fast_update.3 b/man3/libkeccak_fast_update.3
index 5d38b0d..5d38b0d 100644
--- a/libkeccak_fast_update.3
+++ b/man3/libkeccak_fast_update.3
diff --git a/libkeccak_generalised_spec_initialise.3 b/man3/libkeccak_generalised_spec_initialise.3
index acfa173..acfa173 100644
--- a/libkeccak_generalised_spec_initialise.3
+++ b/man3/libkeccak_generalised_spec_initialise.3
diff --git a/libkeccak_generalised_sum_fd.3 b/man3/libkeccak_generalised_sum_fd.3
index 9f5341a..9f5341a 100644
--- a/libkeccak_generalised_sum_fd.3
+++ b/man3/libkeccak_generalised_sum_fd.3
diff --git a/libkeccak_hmac_copy.3 b/man3/libkeccak_hmac_copy.3
index eb80c6e..eb80c6e 100644
--- a/libkeccak_hmac_copy.3
+++ b/man3/libkeccak_hmac_copy.3
diff --git a/libkeccak_hmac_create.3 b/man3/libkeccak_hmac_create.3
index d804f31..d804f31 100644
--- a/libkeccak_hmac_create.3
+++ b/man3/libkeccak_hmac_create.3
diff --git a/libkeccak_hmac_destroy.3 b/man3/libkeccak_hmac_destroy.3
index e2d5b1c..e2d5b1c 100644
--- a/libkeccak_hmac_destroy.3
+++ b/man3/libkeccak_hmac_destroy.3
diff --git a/libkeccak_hmac_digest.3 b/man3/libkeccak_hmac_digest.3
index 9c0ee6b..9c0ee6b 100644
--- a/libkeccak_hmac_digest.3
+++ b/man3/libkeccak_hmac_digest.3
diff --git a/libkeccak_hmac_duplicate.3 b/man3/libkeccak_hmac_duplicate.3
index b1cdc30..b1cdc30 100644
--- a/libkeccak_hmac_duplicate.3
+++ b/man3/libkeccak_hmac_duplicate.3
diff --git a/libkeccak_hmac_fast_destroy.3 b/man3/libkeccak_hmac_fast_destroy.3
index 05a8e2e..05a8e2e 100644
--- a/libkeccak_hmac_fast_destroy.3
+++ b/man3/libkeccak_hmac_fast_destroy.3
diff --git a/libkeccak_hmac_fast_digest.3 b/man3/libkeccak_hmac_fast_digest.3
index 6f21b70..6f21b70 100644
--- a/libkeccak_hmac_fast_digest.3
+++ b/man3/libkeccak_hmac_fast_digest.3
diff --git a/libkeccak_hmac_fast_free.3 b/man3/libkeccak_hmac_fast_free.3
index 87cb556..87cb556 100644
--- a/libkeccak_hmac_fast_free.3
+++ b/man3/libkeccak_hmac_fast_free.3
diff --git a/libkeccak_hmac_fast_update.3 b/man3/libkeccak_hmac_fast_update.3
index ca62baf..ca62baf 100644
--- a/libkeccak_hmac_fast_update.3
+++ b/man3/libkeccak_hmac_fast_update.3
diff --git a/libkeccak_hmac_free.3 b/man3/libkeccak_hmac_free.3
index 91b103e..91b103e 100644
--- a/libkeccak_hmac_free.3
+++ b/man3/libkeccak_hmac_free.3
diff --git a/libkeccak_hmac_initialise.3 b/man3/libkeccak_hmac_initialise.3
index db3590f..db3590f 100644
--- a/libkeccak_hmac_initialise.3
+++ b/man3/libkeccak_hmac_initialise.3
diff --git a/libkeccak_hmac_marshal.3 b/man3/libkeccak_hmac_marshal.3
index 29ca9ea..29ca9ea 100644
--- a/libkeccak_hmac_marshal.3
+++ b/man3/libkeccak_hmac_marshal.3
diff --git a/libkeccak_hmac_reset.3 b/man3/libkeccak_hmac_reset.3
index 963ad4c..963ad4c 100644
--- a/libkeccak_hmac_reset.3
+++ b/man3/libkeccak_hmac_reset.3
diff --git a/libkeccak_hmac_set_key.3 b/man3/libkeccak_hmac_set_key.3
index f961ade..f961ade 100644
--- a/libkeccak_hmac_set_key.3
+++ b/man3/libkeccak_hmac_set_key.3
diff --git a/libkeccak_hmac_unmarshal.3 b/man3/libkeccak_hmac_unmarshal.3
index 7224282..7224282 100644
--- a/libkeccak_hmac_unmarshal.3
+++ b/man3/libkeccak_hmac_unmarshal.3
diff --git a/libkeccak_hmac_update.3 b/man3/libkeccak_hmac_update.3
index e34bb98..e34bb98 100644
--- a/libkeccak_hmac_update.3
+++ b/man3/libkeccak_hmac_update.3
diff --git a/libkeccak_hmac_wipe.3 b/man3/libkeccak_hmac_wipe.3
index ceee5d7..ceee5d7 100644
--- a/libkeccak_hmac_wipe.3
+++ b/man3/libkeccak_hmac_wipe.3
diff --git a/libkeccak_keccaksum_fd.3 b/man3/libkeccak_keccaksum_fd.3
index 82d1fb9..82d1fb9 100644
--- a/libkeccak_keccaksum_fd.3
+++ b/man3/libkeccak_keccaksum_fd.3
diff --git a/libkeccak_rawshakesum_fd.3 b/man3/libkeccak_rawshakesum_fd.3
index 5678389..5678389 100644
--- a/libkeccak_rawshakesum_fd.3
+++ b/man3/libkeccak_rawshakesum_fd.3
diff --git a/libkeccak_sha3sum_fd.3 b/man3/libkeccak_sha3sum_fd.3
index d27618d..d27618d 100644
--- a/libkeccak_sha3sum_fd.3
+++ b/man3/libkeccak_sha3sum_fd.3
diff --git a/libkeccak_shakesum_fd.3 b/man3/libkeccak_shakesum_fd.3
index 58b980d..58b980d 100644
--- a/libkeccak_shakesum_fd.3
+++ b/man3/libkeccak_shakesum_fd.3
diff --git a/libkeccak_simple_squeeze.3 b/man3/libkeccak_simple_squeeze.3
index 0ddfaea..0ddfaea 100644
--- a/libkeccak_simple_squeeze.3
+++ b/man3/libkeccak_simple_squeeze.3
diff --git a/libkeccak_spec_check.3 b/man3/libkeccak_spec_check.3
index 3b5c9df..3b5c9df 100644
--- a/libkeccak_spec_check.3
+++ b/man3/libkeccak_spec_check.3
diff --git a/libkeccak_spec_cshake.3 b/man3/libkeccak_spec_cshake.3
index dfd8ee9..dfd8ee9 100644
--- a/libkeccak_spec_cshake.3
+++ b/man3/libkeccak_spec_cshake.3
diff --git a/libkeccak_spec_rawshake.3 b/man3/libkeccak_spec_rawshake.3
index 5d810b2..5d810b2 100644
--- a/libkeccak_spec_rawshake.3
+++ b/man3/libkeccak_spec_rawshake.3
diff --git a/libkeccak_spec_sha3.3 b/man3/libkeccak_spec_sha3.3
index 9cafbf6..9cafbf6 100644
--- a/libkeccak_spec_sha3.3
+++ b/man3/libkeccak_spec_sha3.3
diff --git a/libkeccak_spec_shake.3 b/man3/libkeccak_spec_shake.3
index c98962f..c98962f 100644
--- a/libkeccak_spec_shake.3
+++ b/man3/libkeccak_spec_shake.3
diff --git a/libkeccak_squeeze.3 b/man3/libkeccak_squeeze.3
index 1510bb3..1510bb3 100644
--- a/libkeccak_squeeze.3
+++ b/man3/libkeccak_squeeze.3
diff --git a/libkeccak_state_copy.3 b/man3/libkeccak_state_copy.3
index 84f6352..84f6352 100644
--- a/libkeccak_state_copy.3
+++ b/man3/libkeccak_state_copy.3
diff --git a/libkeccak_state_create.3 b/man3/libkeccak_state_create.3
index d037435..d037435 100644
--- a/libkeccak_state_create.3
+++ b/man3/libkeccak_state_create.3
diff --git a/libkeccak_state_destroy.3 b/man3/libkeccak_state_destroy.3
index 34365f1..34365f1 100644
--- a/libkeccak_state_destroy.3
+++ b/man3/libkeccak_state_destroy.3
diff --git a/libkeccak_state_duplicate.3 b/man3/libkeccak_state_duplicate.3
index ef0bcba..ef0bcba 100644
--- a/libkeccak_state_duplicate.3
+++ b/man3/libkeccak_state_duplicate.3
diff --git a/libkeccak_state_fast_destroy.3 b/man3/libkeccak_state_fast_destroy.3
index bcfdc42..bcfdc42 100644
--- a/libkeccak_state_fast_destroy.3
+++ b/man3/libkeccak_state_fast_destroy.3
diff --git a/libkeccak_state_fast_free.3 b/man3/libkeccak_state_fast_free.3
index 63eac25..63eac25 100644
--- a/libkeccak_state_fast_free.3
+++ b/man3/libkeccak_state_fast_free.3
diff --git a/libkeccak_state_free.3 b/man3/libkeccak_state_free.3
index 529276e..529276e 100644
--- a/libkeccak_state_free.3
+++ b/man3/libkeccak_state_free.3
diff --git a/libkeccak_state_initialise.3 b/man3/libkeccak_state_initialise.3
index 3c63af7..3c63af7 100644
--- a/libkeccak_state_initialise.3
+++ b/man3/libkeccak_state_initialise.3
diff --git a/libkeccak_state_marshal.3 b/man3/libkeccak_state_marshal.3
index 0599b5a..0599b5a 100644
--- a/libkeccak_state_marshal.3
+++ b/man3/libkeccak_state_marshal.3
diff --git a/libkeccak_state_reset.3 b/man3/libkeccak_state_reset.3
index e847501..e847501 100644
--- a/libkeccak_state_reset.3
+++ b/man3/libkeccak_state_reset.3
diff --git a/libkeccak_state_unmarshal.3 b/man3/libkeccak_state_unmarshal.3
index 6198e3a..6198e3a 100644
--- a/libkeccak_state_unmarshal.3
+++ b/man3/libkeccak_state_unmarshal.3
diff --git a/libkeccak_state_wipe.3 b/man3/libkeccak_state_wipe.3
index 9028dcc..9028dcc 100644
--- a/libkeccak_state_wipe.3
+++ b/man3/libkeccak_state_wipe.3
diff --git a/libkeccak_state_wipe_message.3 b/man3/libkeccak_state_wipe_message.3
index 27c838a..27c838a 100644
--- a/libkeccak_state_wipe_message.3
+++ b/man3/libkeccak_state_wipe_message.3
diff --git a/libkeccak_state_wipe_sponge.3 b/man3/libkeccak_state_wipe_sponge.3
index b36e5b4..b36e5b4 100644
--- a/libkeccak_state_wipe_sponge.3
+++ b/man3/libkeccak_state_wipe_sponge.3
diff --git a/libkeccak_unhex.3 b/man3/libkeccak_unhex.3
index c7dc9bc..c7dc9bc 100644
--- a/libkeccak_unhex.3
+++ b/man3/libkeccak_unhex.3
diff --git a/libkeccak_update.3 b/man3/libkeccak_update.3
index 384e492..384e492 100644
--- a/libkeccak_update.3
+++ b/man3/libkeccak_update.3
diff --git a/libkeccak_zerocopy_chunksize.3 b/man3/libkeccak_zerocopy_chunksize.3
index b507c7f..b507c7f 100644
--- a/libkeccak_zerocopy_chunksize.3
+++ b/man3/libkeccak_zerocopy_chunksize.3
diff --git a/libkeccak_zerocopy_digest.3 b/man3/libkeccak_zerocopy_digest.3
index 6b752fb..6b752fb 100644
--- a/libkeccak_zerocopy_digest.3
+++ b/man3/libkeccak_zerocopy_digest.3
diff --git a/libkeccak_zerocopy_update.3 b/man3/libkeccak_zerocopy_update.3
index b4086a0..b4086a0 100644
--- a/libkeccak_zerocopy_update.3
+++ b/man3/libkeccak_zerocopy_update.3
diff --git a/libkeccak.7 b/man7/libkeccak.7
index 34c9dba..34c9dba 100644
--- a/libkeccak.7
+++ b/man7/libkeccak.7