diff --git a/codepot/etc/Makefile.am b/codepot/etc/Makefile.am
index 34b9fae7..2cb689e2 100644
--- a/codepot/etc/Makefile.am
+++ b/codepot/etc/Makefile.am
@@ -8,3 +8,7 @@ perl_SCRIPTS=perl/Codepot/AccessHandler.pm perl/Codepot/AuthenHandler.pm
 
 EXTRA_DIST = $(cfg_DATA) $(cfg_SCRIPTS) $(perl_SCRIPTS) 
 
+install-exec-hook:
+	perl -e 'use Digest::SHA1' 2>/dev/null || \
+	perl -e 'use Digest::SHA' 2>/dev/null && \
+	sed -ri -e 's|Digest::SHA1|Digest::SHA|g' "$(DESTDIR)$(CFGDIR)/perl/Codepot/AccessHandler.pm"
diff --git a/codepot/etc/Makefile.in b/codepot/etc/Makefile.in
index ce92c81a..86fe8778 100644
--- a/codepot/etc/Makefile.in
+++ b/codepot/etc/Makefile.in
@@ -509,7 +509,8 @@ install-dvi: install-dvi-am
 install-dvi-am:
 
 install-exec-am:
-
+	@$(NORMAL_INSTALL)
+	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
 install-html: install-html-am
 
 install-html-am:
@@ -549,24 +550,29 @@ ps-am:
 uninstall-am: uninstall-cfgDATA uninstall-cfgSCRIPTS \
 	uninstall-perlSCRIPTS
 
-.MAKE: install-am install-strip
+.MAKE: install-am install-exec-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic cscopelist-am \
 	ctags-am distclean distclean-generic distdir dvi dvi-am html \
 	html-am info info-am install install-am install-cfgDATA \
 	install-cfgSCRIPTS install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-perlSCRIPTS install-ps \
-	install-ps-am install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags-am \
-	uninstall uninstall-am uninstall-cfgDATA uninstall-cfgSCRIPTS \
-	uninstall-perlSCRIPTS
+	install-dvi-am install-exec install-exec-am install-exec-hook \
+	install-html install-html-am install-info install-info-am \
+	install-man install-pdf install-pdf-am install-perlSCRIPTS \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+	pdf-am ps ps-am tags-am uninstall uninstall-am \
+	uninstall-cfgDATA uninstall-cfgSCRIPTS uninstall-perlSCRIPTS
 
 .PRECIOUS: Makefile
 
 
+install-exec-hook:
+	perl -e 'use Digest::SHA1' 2>/dev/null || \
+	perl -e 'use Digest::SHA' 2>/dev/null && \
+	sed -ri -e 's|Digest::SHA1|Digest::SHA|g' "$(DESTDIR)$(CFGDIR)/perl/Codepot/AccessHandler.pm"
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/codepot/sbin/Makefile.am b/codepot/sbin/Makefile.am
index fc92b9fb..593f476b 100644
--- a/codepot/sbin/Makefile.am
+++ b/codepot/sbin/Makefile.am
@@ -2,3 +2,8 @@
 sbin_SCRIPTS = codepot-user codepot-mon-httpd
 
 EXTRA_DIST = $(sbin_SCRIPTS)
+
+install-exec-hook:
+	perl -e 'use Digest::SHA1' 2>/dev/null || \
+	perl -e 'use Digest::SHA' 2>/dev/null && \
+	sed -ri -e 's|Digest::SHA1|Digest::SHA|g' "$(DESTDIR)$(sbindir)/codepot-user"
diff --git a/codepot/sbin/Makefile.in b/codepot/sbin/Makefile.in
index 82e114f2..be719c61 100644
--- a/codepot/sbin/Makefile.in
+++ b/codepot/sbin/Makefile.in
@@ -426,7 +426,8 @@ install-dvi: install-dvi-am
 install-dvi-am:
 
 install-exec-am: install-sbinSCRIPTS
-
+	@$(NORMAL_INSTALL)
+	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
 install-html: install-html-am
 
 install-html-am:
@@ -465,23 +466,28 @@ ps-am:
 
 uninstall-am: uninstall-sbinSCRIPTS
 
-.MAKE: install-am install-strip
+.MAKE: install-am install-exec-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic cscopelist-am \
 	ctags-am distclean distclean-generic distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
 	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-sbinSCRIPTS install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am tags-am uninstall uninstall-am \
-	uninstall-sbinSCRIPTS
+	install-exec-am install-exec-hook install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-sbinSCRIPTS \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic pdf pdf-am ps ps-am tags-am uninstall \
+	uninstall-am uninstall-sbinSCRIPTS
 
 .PRECIOUS: Makefile
 
 
+install-exec-hook:
+	perl -e 'use Digest::SHA1' 2>/dev/null || \
+	perl -e 'use Digest::SHA' 2>/dev/null && \
+	sed -ri -e 's|Digest::SHA1|Digest::SHA|g' '$(DESTDIR)$(sbindir)/codepot-user'
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT: