diff --git a/stand/libsa/Makefile b/stand/libsa/Makefile
index f7d7778d5653..bc85a3dcb0de 100644
--- a/stand/libsa/Makefile
+++ b/stand/libsa/Makefile
@@ -180,6 +180,15 @@ SRCS+=  explicit_bzero.c crc32_libkern.c
 .include "${SASRC}/zfs/Makefile.inc"
 .endif
 
+# Crypto hashing functions
+# sha256 and sha512 from sys/crypto
+.PATH: ${SYSDIR}/crypto/sha2
+SRCS+=		sha256c.c sha512c.c
+
+# md5 from libmd
+.PATH: ${SRCTOP}/lib/libmd
+SRCS+=		md5c.c
+
 .if ${DO32:U0} == 0
 MAN=libsa.3
 .endif
diff --git a/stand/libsa/geli/Makefile.inc b/stand/libsa/geli/Makefile.inc
index 0d9fcb90bbd8..07600d5287bd 100644
--- a/stand/libsa/geli/Makefile.inc
+++ b/stand/libsa/geli/Makefile.inc
@@ -5,16 +5,6 @@
 # Our password input method
 SRCS+=		pwgets.c
 
-# sha256 and sha512 from sys/crypto
-.PATH: ${SYSDIR}/crypto/sha2
-CFLAGS.sha256.c+=	-DWEAK_REFS
-CFLAGS.sha512.c+=	-DWEAK_REFS
-SRCS+=		sha256c.c sha512c.c
-
-# md5 from libmd
-.PATH: ${SRCTOP}/lib/libmd
-SRCS+=		md5c.c
-
 # AES implementation from sys/crypto
 .PATH: ${SYSDIR}/crypto/rijndael
 .for i in rijndael-alg-fst.c rijndael-api-fst.c rijndael-api.c
@@ -23,7 +13,6 @@ CFLAGS.${i}+=	-DNDEBUG
 SRCS+=		${i}
 .endfor
 
-
 # local GELI Implementation
 .PATH: ${SYSDIR}/geom/eli
 .for i in gelidev.c geli_metadata.c