diff --git a/configure.in b/configure.in
index 5189b01d1..229fa3b69 100644
--- a/configure.in
+++ b/configure.in
@@ -281,12 +281,11 @@ if test "x$enable_ruby" = "xyes" ; then
 fi
 
 if test "x$enable_plugins" = "xyes" ; then
-    PLUGINS_LIBS="../../plugins/lib_weechat_plugins.a"
     AC_CHECK_FUNCS(dlopen, LIBDL_FOUND=yes, LIBDL_FOUND=no)
     if test "$LIBDL_FOUND" != "yes"; then
         AC_CHECK_LIB(dl, dlopen, LIBDL_FOUND=yes, LIBDL_FOUND=no)
         if test "$LIBDL_FOUND" = "yes"; then
-            PLUGINS_LIBS="$PLUGINS_LIBS -ldl"
+            PLUGINS_LIBS="-ldl"
         else
             AC_MSG_ERROR([
 *** "dl" library (dynamic library loader) couldn't be found in your system.
diff --git a/src/gui/curses/Makefile.am b/src/gui/curses/Makefile.am
index 3466970b8..9d51c05f0 100644
--- a/src/gui/curses/Makefile.am
+++ b/src/gui/curses/Makefile.am
@@ -19,6 +19,16 @@ INCLUDES = -DLOCALEDIR=\"$(datadir)/locale\"
 
 bin_PROGRAMS = weechat-curses
 
+if PLUGINS
+weechat_curses_LDADD = ../gui-common.o ../gui-keyboard.o \
+                       ../gui-action.o \
+                       ../../common/lib_weechat_main.a \
+                       ../../irc/lib_weechat_irc.a \
+                       ../../plugins/lib_weechat_plugins.a \
+                       $(PLUGINS_LIBS) \
+                       $(NCURSES_LIBS) \
+                       $(GNUTLS_LFLAGS)
+else
 weechat_curses_LDADD = ../gui-common.o ../gui-keyboard.o \
                        ../gui-action.o \
                        ../../common/lib_weechat_main.a \
@@ -26,6 +36,7 @@ weechat_curses_LDADD = ../gui-common.o ../gui-keyboard.o \
                        $(PLUGINS_LIBS) \
                        $(NCURSES_LIBS) \
                        $(GNUTLS_LFLAGS)
+endif
 
 weechat_curses_SOURCES = gui-display.c \
                          gui-input.c
diff --git a/weechat/configure.in b/weechat/configure.in
index 5189b01d1..229fa3b69 100644
--- a/weechat/configure.in
+++ b/weechat/configure.in
@@ -281,12 +281,11 @@ if test "x$enable_ruby" = "xyes" ; then
 fi
 
 if test "x$enable_plugins" = "xyes" ; then
-    PLUGINS_LIBS="../../plugins/lib_weechat_plugins.a"
     AC_CHECK_FUNCS(dlopen, LIBDL_FOUND=yes, LIBDL_FOUND=no)
     if test "$LIBDL_FOUND" != "yes"; then
         AC_CHECK_LIB(dl, dlopen, LIBDL_FOUND=yes, LIBDL_FOUND=no)
         if test "$LIBDL_FOUND" = "yes"; then
-            PLUGINS_LIBS="$PLUGINS_LIBS -ldl"
+            PLUGINS_LIBS="-ldl"
         else
             AC_MSG_ERROR([
 *** "dl" library (dynamic library loader) couldn't be found in your system.
diff --git a/weechat/src/gui/curses/Makefile.am b/weechat/src/gui/curses/Makefile.am
index 3466970b8..9d51c05f0 100644
--- a/weechat/src/gui/curses/Makefile.am
+++ b/weechat/src/gui/curses/Makefile.am
@@ -19,6 +19,16 @@ INCLUDES = -DLOCALEDIR=\"$(datadir)/locale\"
 
 bin_PROGRAMS = weechat-curses
 
+if PLUGINS
+weechat_curses_LDADD = ../gui-common.o ../gui-keyboard.o \
+                       ../gui-action.o \
+                       ../../common/lib_weechat_main.a \
+                       ../../irc/lib_weechat_irc.a \
+                       ../../plugins/lib_weechat_plugins.a \
+                       $(PLUGINS_LIBS) \
+                       $(NCURSES_LIBS) \
+                       $(GNUTLS_LFLAGS)
+else
 weechat_curses_LDADD = ../gui-common.o ../gui-keyboard.o \
                        ../gui-action.o \
                        ../../common/lib_weechat_main.a \
@@ -26,6 +36,7 @@ weechat_curses_LDADD = ../gui-common.o ../gui-keyboard.o \
                        $(PLUGINS_LIBS) \
                        $(NCURSES_LIBS) \
                        $(GNUTLS_LFLAGS)
+endif
 
 weechat_curses_SOURCES = gui-display.c \
                          gui-input.c