diff --git a/ChangeLog b/ChangeLog
index fb41b86a..c6eb87e5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-01-31  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	Use AT_CHECK more liberally in duplicate members test.
+	* tests/duplicate_members.at (duplicate members in archive
+	tests): Wrap link commands in AT_CHECK, they might fail, as seen
+	on QNX.
+	* THANKS: Update.
+	Report by Mike Gorchak.
+
 2009-01-30  Akim Demaille  <demaille@gostai.com>
 
 	Fix cwrapper warnings from MSVC 2005.
diff --git a/THANKS b/THANKS
index d1ed8461..6acff4da 100644
--- a/THANKS
+++ b/THANKS
@@ -116,6 +116,7 @@
   Marcel Loose			loose@astron.nl
   Mark Kettenis			kettenis@phys.uva.nl
   Michael Haubenwallner		michael.haubenwallner@salomon.at
+  Mike Gorchak			mike@malva.ua
   Mike Frysinger		vapier@gentoo.org
   Nix				nix@esperi.org.uk
   Olaf Lenz			olenz@fias.uni-frankfurt.de
diff --git a/tests/duplicate_members.at b/tests/duplicate_members.at
index 657e307e..4f054f7e 100755
--- a/tests/duplicate_members.at
+++ b/tests/duplicate_members.at
@@ -61,13 +61,16 @@ do
   $LIBTOOL --mode=compile --tag=CC $CC $CPPFLAGS $CFLAGS -c -o $a/a.lo $a/a.c
 done
 $LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o libc0.la 6/a.lo
-$LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o libconv.la 1/a.lo 2/a.lo 3/a.lo 4/a.lo 5/a.lo libc0.la
+AT_CHECK([$LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o libconv.la ]dnl
+	 [1/a.lo 2/a.lo 3/a.lo 4/a.lo 5/a.lo libc0.la], [], [ignore], [ignore])
 
 $LIBTOOL --mode=compile --tag=CC $CC $CPPFLAGS $CFLAGS -c -o bar.lo bar.c
-$LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o libbar.la bar.lo libconv.la -rpath /notexist
+AT_CHECK([$LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o libbar.la ]dnl
+	 [ bar.lo libconv.la -rpath /notexist], [], [ignore], [ignore])
 
 $LIBTOOL --mode=compile --tag=CC $CC $CPPFLAGS $CFLAGS -c -o main.lo main.c
-$LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o main$EXEEXT main.lo ./libbar.la
+AT_CHECK([$LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o main$EXEEXT ]dnl
+	 [main.lo ./libbar.la], [], [ignore], [ignore])
 
 LT_AT_EXEC_CHECK([./main],[0],[ignore],[ignore])