diff --git a/Configure b/Configure
index 1230958527b3818d72ebeaa0e8319bc513bf4a7d..3b649de2522e268164cc7e397b77c1836018c515 100755
--- a/Configure
+++ b/Configure
@@ -650,6 +650,7 @@ my $openssl_thread_defines;
 my $openssl_sys_defines="";
 my $openssl_other_defines;
 my $libs;
+my $libkrb5="";
 my $target;
 my $options;
 my $symlink;
@@ -1037,8 +1038,6 @@ else
 	$withargs{"krb5-include"} = "-I".$withargs{"krb5-dir"}."/include"
 		if $withargs{"krb5-include"} eq "" &&
 		   $withargs{"krb5-dir"} ne "";
-
-	$libs.=$withargs{"krb5-lib"}." " if $withargs{"krb5-lib"} ne "";
 	}
 
 # The DSO code currently always implements all functions so that no
@@ -1273,6 +1272,7 @@ while (<IN>)
 	s/^ARFLAGS=.*/ARFLAGS= $arflags/;
 	s/^PERL=.*/PERL= $perl/;
 	s/^KRB5_INCLUDES=.*/KRB5_INCLUDES=$withargs{"krb5-include"}/;
+	s/^LIBKRB5=.*/LIBKRB5=$withargs{"krb5-lib"}/;
 	s/^SHLIB_TARGET=.*/SHLIB_TARGET=$shared_target/;
 	s/^SHLIB_MARK=.*/SHLIB_MARK=$shared_mark/;
 	s/^SHARED_LIBS=.*/SHARED_LIBS=\$(SHARED_CRYPTO) \$(SHARED_SSL)/ if (!$no_shared);
diff --git a/Makefile.org b/Makefile.org
index 847bcebad177edb583b2a775668462eb5aed1657..1baf7e8b44de1e704c0d797e20b62905f6bc613e 100644
--- a/Makefile.org
+++ b/Makefile.org
@@ -167,6 +167,7 @@ RMD160_ASM_OBJ= asm/rm86-out.o
 
 # KRB5 stuff
 KRB5_INCLUDES=
+LIBKRB5=
 
 DIRS=   crypto ssl engines apps test tools
 SHLIBDIRS= crypto ssl
@@ -280,6 +281,9 @@ build-shared: do_$(SHLIB_TARGET) link-shared
 
 do_$(SHLIB_TARGET):
 	@ libs='-L. ${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \
+		if [ "${SHLIBDIRS}" = "ssl" -a -n "$(LIBKRB5)" ]; then \
+			libs="$(LIBKRB5) $$libs"; \
+		fi; \
 		$(NEWMAKE) -f Makefile.shared \
 			CC="$(CC)" LDFLAGS="$(LDFLAGS)" \
 			SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \
@@ -288,7 +292,7 @@ do_$(SHLIB_TARGET):
 			LIBDEPS="$$libs $(EX_LIBS)" \
 			LIBRPATH="$(INSTALLTOP)/lib" \
 			link_a.$(SHLIB_TARGET); \
-		libs="$$libs -l$$i"; \
+		libs="-l$$i $$libs"; \
 	done
 
 openssl.pc: Makefile.ssl
diff --git a/apps/Makefile.ssl b/apps/Makefile.ssl
index af0002341ab2aaea511205a93c1cbca44ca79653..7dce73d610784f2ebeb1ab221cd3015228aa8864 100644
--- a/apps/Makefile.ssl
+++ b/apps/Makefile.ssl
@@ -19,6 +19,7 @@ PERL=		perl
 RM=		rm -f
 # KRB5 stuff
 KRB5_INCLUDES=
+LIBKRB5=
 
 PEX_LIBS=
 EX_LIBS= 
diff --git a/test/Makefile.ssl b/test/Makefile.ssl
index a75727b06607c560b9fb957ba0eaba986e087dae..344d21ef8554a85837f02a97a64d5af89592ea3c 100644
--- a/test/Makefile.ssl
+++ b/test/Makefile.ssl
@@ -16,6 +16,9 @@ MAKE=		$(NEWMAKE) -f $(MAKEFILE)
 MAKEDEPPROG=	makedepend
 MAKEDEPEND=	$(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
 PERL=		perl
+# KRB5 stuff
+KRB5_INCLUDES=
+LIBKRB5=
 
 PEX_LIBS=
 EX_LIBS= #-lnsl -lsocket