diff --git a/ChangeLog b/ChangeLog
index 4aa487052..0bd8d901a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20080228
+ - (dtucker) [configure.ac] Add -fstack-protector to LDFLAGS too, fixes
+   linking problems on AIX with gcc 4.1.x.
+
 20080225
  - (dtucker) [openbsd-compat/fake-rfc2553.h] rename ssh_gai_strerror hack
    since it now conflicts with the helper function in misc.c.  From
@@ -3627,4 +3631,4 @@
    OpenServer 6 and add osr5bigcrypt support so when someone migrates
    passwords between UnixWare and OpenServer they will still work. OK dtucker@
 
-$Id: ChangeLog,v 1.4841 2008/02/25 10:13:47 dtucker Exp $
+$Id: ChangeLog,v 1.4842 2008/02/28 04:01:13 dtucker Exp $
diff --git a/configure.ac b/configure.ac
index f9e2d8b34..eaa1f845a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.390 2008/02/25 10:05:04 dtucker Exp $
+# $Id: configure.ac,v 1.391 2008/02/28 04:01:13 dtucker Exp $
 #
 # Copyright (c) 1999-2004 Damien Miller
 #
@@ -15,7 +15,7 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org)
-AC_REVISION($Revision: 1.390 $)
+AC_REVISION($Revision: 1.391 $)
 AC_CONFIG_SRCDIR([ssh.c])
 
 AC_CONFIG_HEADER(config.h)
@@ -107,11 +107,15 @@ if test "$GCC" = "yes" || test "$GCC" = "egcs"; then
 
 	AC_MSG_CHECKING(if $CC understands -fstack-protector-all)
 	saved_CFLAGS="$CFLAGS"
+	saved_LDFLAGS="$LDFLAGS"
 	CFLAGS="$CFLAGS -fstack-protector-all"
-	AC_TRY_COMPILE([], [ int main(void){return 0;} ],
+	LDFLAGS="$LDFLAGS -fstack-protector-all"
+	AC_TRY_LINK([], [ int main(void){return 0;} ],
 	    [ AC_MSG_RESULT(yes) ],
 	    [ AC_MSG_RESULT(no)
-	      CFLAGS="$saved_CFLAGS" ]
+	      CFLAGS="$saved_CFLAGS"
+	      LDFLAGS="$saved_LDFLAGS"
+	     ]
 	)
 
 	if test -z "$have_llong_max"; then