diff --git a/mbuni/.cvsignore b/mbuni/.cvsignore
index 0fb1263..f5e454a 100644
--- a/mbuni/.cvsignore
+++ b/mbuni/.cvsignore
@@ -16,3 +16,9 @@ config.cache
 libtool
 config.status
 gmon.out
+autom4te.cache
+mbuni-config.h
+mbuni-config.h.in
+.cproject
+.project
+stamp-h1
diff --git a/mbuni/configure.ac b/mbuni/configure.ac
index b2abc41..b6dea8b 100644
--- a/mbuni/configure.ac
+++ b/mbuni/configure.ac
@@ -251,8 +251,9 @@ else
         AC_MSG_RESULT([$gw_version])
         AC_MSG_CHECKING([Kannel libs])
         if ! $GW_CONFIG --libs &>/dev/null ; then
-                LDFLAGS="$LDFLAGS `$GW_CONFIG --libs`"
                 gw_libdir=`$GW_CONFIG --libs`
+                LDFLAGS="$LDFLAGS $gw_libdir"
+		LIBS="$LIBS $gw_libdir"
                 AC_MSG_RESULT([$gw_libdir])
         fi
         AC_MSG_CHECKING([Kannel includes])