diff --git a/ChangeLog b/ChangeLog
index 47ce84f..5a465b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-25 Hasso Tepper <hasso at quagga.net>
+
+	* configure.ac, vtysh/Makefile.am: Only vtysh needs to be linked
+	  against libreadline and friends.
+
 2005-08-13 Paul Jakma <paul@jakma.org>
 
 	* Makefile.am: (EXTRA_DIST) Add the trailing slash back in which
diff --git a/configure.ac b/configure.ac
index 6aa0050..9048311 100755
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@
 ##  Copyright (c) 1996, 97, 98, 99, 2000 Kunihiro Ishiguro <kunihiro@zebra.org>
 ##  Portions Copyright (c) 2003 Paul Jakma <paul@dishone.st>
 ##
-## $Id: configure.ac,v 1.109 2005/06/30 13:52:20 hasso Exp $
+## $Id: configure.ac,v 1.110 2005/08/25 12:00:58 hasso Exp $
 AC_PREREQ(2.53)
 
 AC_INIT(Quagga, 0.99.1, [http://bugzilla.quagga.net])
@@ -397,11 +397,11 @@
 dnl	 configure time.  We follow readline's search order.
 dnl	 The required procedures are in libtermcap on NetBSD, in
 dnl	 [TODO] on Linux, and in [TODO] on Solaris.
-	 AC_CHECK_LIB(termcap, tputs, ,
-	 	AC_CHECK_LIB(tinfo, tputs, ,
-	 	AC_CHECK_LIB(curses, tputs, ,
-	 	AC_CHECK_LIB(ncurses, tputs))))
-         AC_CHECK_LIB(readline, main)
+	 AC_CHECK_LIB(termcap, tputs, LIBREADLINE="$LIBREADLINE -ltermcap",
+	 	AC_CHECK_LIB(tinfo, tputs, LIBREADLINE="$LIBREADLINE -ltinfo",
+	 	AC_CHECK_LIB(curses, tputs, LIBREADLINE="$LIBREADLINE -lcurses",
+	 	AC_CHECK_LIB(ncurses, tputs, LIBREADLINE="$LIBREADLINE -lncurses"))))
+         AC_CHECK_LIB(readline, main, LIBREADLINE="$LIBREADLINE -lreadline")
          if test $ac_cv_lib_readline_main = no; then
            AC_MSG_ERROR([vtysh needs libreadline but was not found and usable on your system.])
          fi
@@ -409,7 +409,7 @@
 	 if test $ac_cv_header_readline_history_h = no;then
            AC_MSG_ERROR([readline is too old to have readline/history.h, please update to the latest readline library.])
 	 fi
-	 AC_CHECK_LIB(readline, rl_completion_matches)
+	 AC_CHECK_LIB(readline, rl_completion_matches, LIBREADLINE="$LIBREADLINE")
          if test $ac_cv_lib_readline_rl_completion_matches = no; then
            AC_DEFINE(rl_completion_matches,completion_matches,Old readline)
 	 fi
@@ -417,6 +417,7 @@
   "no" ) VTYSH="";;
   *    ) ;;
 esac
+AC_SUBST(LIBREADLINE)
 
 dnl ----------
 dnl PAM module
@@ -1363,7 +1364,7 @@
 compiler                : ${CC}
 compiler flags          : ${CFLAGS}
 includes                : ${INCLUDES} ${SNMP_INCLUDES}
-linker flags            : ${LDFLAGS} ${LIBS}
+linker flags            : ${LDFLAGS} ${LIBS} ${LIBCAP} ${LIBREADLINE}
 state file directory    : ${quagga_statedir}
 config file directory   : `eval echo \`echo ${sysconfdir}\``
 example directory       : `eval echo \`echo ${exampledir}\``
diff --git a/vtysh/Makefile.am b/vtysh/Makefile.am
index 35dc763..dbd1d3d 100644
--- a/vtysh/Makefile.am
+++ b/vtysh/Makefile.am
@@ -11,7 +11,7 @@
 nodist_vtysh_SOURCES = vtysh_cmd.c
 CLEANFILES = vtysh_cmd.c
 noinst_HEADERS = vtysh.h vtysh_user.h
-vtysh_LDADD = ../lib/libzebra.la @LIBCAP@
+vtysh_LDADD = ../lib/libzebra.la @LIBCAP@ @LIBREADLINE@
 
 examplesdir = $(exampledir)
 dist_examples_DATA = vtysh.conf.sample