diff --git a/ChangeLog b/ChangeLog
index 444e84d67..77c3bf529 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-06-02  Alexandre Duret-Lutz  <adl@lrde.epita.fr>
+
+	* iface/nips/Makefile.am (empt_check_LDADD, dottynips_LDADD):
+	Do not link libnipsvm.la here...
+	(libspotnips_la_LIBADD): ... do it here.
+
 2008-05-29  Guillaume SADEGH  <sadegh@lrde.epita.fr>
 
 	* iface/nips/nips.cc, iface/nips/nips.hh, iface/nips/common.cc,
diff --git a/iface/nips/Makefile.am b/iface/nips/Makefile.am
index 1d474c2f4..dcb50ea13 100644
--- a/iface/nips/Makefile.am
+++ b/iface/nips/Makefile.am
@@ -29,7 +29,7 @@ nips_HEADERS = \
   nips.hh
 
 lib_LTLIBRARIES = libspotnips.la
-libspotnips_la_LIBADD = $(top_builddir)/src/libspot.la
+libspotnips_la_LIBADD = $(top_builddir)/src/libspot.la $(builddir)/nips_vm/libnipsvm.la
 libspotnips_la_SOURCES = \
   common.cc \
   nips.cc
@@ -38,9 +38,9 @@ noinst_PROGRAMS = \
   dottynips empt_check
 
 dottynips_SOURCES = dottynips.cc
-dottynips_LDADD = libspotnips.la $(builddir)/nips_vm/libnipsvm.la
+dottynips_LDADD = libspotnips.la
 
 empt_check_SOURCES = emptiness_check.cc
-empt_check_LDADD = libspotnips.la $(builddir)/nips_vm/libnipsvm.la
+empt_check_LDADD = libspotnips.la
 
 SUBDIRS = nips_vm