diff --git a/Configure b/Configure
index 66b1d84ee1..390e21e038 100755
--- a/Configure
+++ b/Configure
@@ -135,8 +135,8 @@ my %table=(
 "irix-mips3-gcc","gcc:-mips3 -O2 -DTERMIOS -DB_ENDIAN:(unknown)::MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC2 DES_PTR BF_PTR SIXTY_FOUR_BIT:::",
 "irix-mips3-cc", "cc:-n32 -mips3 -O2 -use_readonly_const -DTERMIOS -DB_ENDIAN:(unknown)::DES_PTR DES_RISC2 DES_UNROLL BF_PTR SIXTY_FOUR_BIT:::",
 "debug-irix-cc", "cc:-w2 -g -DCRYPTO_MDEBUG -DTERMIOS -DB_ENDIAN:(unknown):::::",
-# This is the n64 mode build. (Untested!)
-"irix64-mips4-cc", "cc:-64 -mips4 -O2 -use_readonly_const -DTERMIOS:(unknown)::DES_RISC2 DES_UNROLL SIXTY_FOUR_BIT:::",
+# This is the n64 mode build.
+"irix64-mips4-cc", "cc:-64 -mips4 -O2 -use_readonly_const -DTERMIOS -DB_ENDIAN:(unknown)::DES_RISC2 DES_UNROLL SIXTY_FOUR_BIT_LONG:::",
 
 # HPUX 9.X config.
 # Don't use the bundled cc.  It is broken.  Use HP ANSI C if possible, or gcc.
diff --git a/crypto/sha/sha1dgst.c b/crypto/sha/sha1dgst.c
index de8fa84e24..af8d9aed8a 100644
--- a/crypto/sha/sha1dgst.c
+++ b/crypto/sha/sha1dgst.c
@@ -216,7 +216,7 @@ void SHA1_Update(SHA_CTX *c, const register unsigned char *data,
 		data+=SHA_CBLOCK;
 		sha1_block(c,p=c->data,1);
 		len-=SHA_CBLOCK;
-#else	/* little-endian */
+#elif defined(L_ENDIAN)
 #define BE_COPY(dst,src,i)	{				\
 				l = ((SHA_LONG *)src)[i];	\
 				Endian_Reverse32(l);		\
@@ -280,7 +280,7 @@ void SHA1_Transform(SHA_CTX *c, unsigned char *b)
 	memcpy(p,b,SHA_CBLOCK);
 	sha1_block(c,p,1);
 	return;
-#else
+#elif defined(L_ENDIAN)
 	if (((unsigned long)b%sizeof(SHA_LONG)) == 0)
 		{
 		SHA_LONG *q;
diff --git a/crypto/sha/sha_dgst.c b/crypto/sha/sha_dgst.c
index 7504fb7c08..f4aa5a5144 100644
--- a/crypto/sha/sha_dgst.c
+++ b/crypto/sha/sha_dgst.c
@@ -211,7 +211,7 @@ void SHA_Update(SHA_CTX *c, const register unsigned char *data,
 		data+=SHA_CBLOCK;
 		sha_block(c,p=c->data,1);
 		len-=SHA_CBLOCK;
-#else	/* little-endian */
+#elif defined(L_ENDIAN)
 #define BE_COPY(dst,src,i)	{				\
 				l = ((SHA_LONG *)src)[i];	\
 				Endian_Reverse32(l);		\
@@ -275,7 +275,7 @@ void SHA_Transform(SHA_CTX *c, unsigned char *b)
 	memcpy(p,b,SHA_CBLOCK);
 	sha_block(c,p,1);
 	return;
-#else
+#elif defined(L_ENDIAN)
 	if (((unsigned long)b%sizeof(SHA_LONG)) == 0)
 		{
 		SHA_LONG *q;