diff --git a/ChangeLog b/ChangeLog
index c7994a1fc..72fa3b075 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-06-03  Alexandre Duret-Lutz  <adl@lrde.epita.fr>
+
+	Install interfaces' headers in the spot/iface/ directory, not
+	directly in the spot/ directory.
+
+	* iface/gspn/Makefile.am (gspndir): Install in spot/iface/gspn/.
+	* iface/nips/Makefile.am (nipsdir): Install in spot/iface/nips/.
+
 2008-06-02  Alexandre Duret-Lutz  <adl@lrde.epita.fr>
 
 	* iface/nips/nips_vm/Makefile.am: Do not install NipsVM.
diff --git a/iface/gspn/Makefile.am b/iface/gspn/Makefile.am
index 47c5d704f..a8a37f46d 100644
--- a/iface/gspn/Makefile.am
+++ b/iface/gspn/Makefile.am
@@ -1,4 +1,4 @@
-## Copyright (C) 2003, 2004  Laboratoire d'Informatique de Paris 6 (LIP6),
+## Copyright (C) 2003, 2004, 2008  Laboratoire d'Informatique de Paris 6 (LIP6),
 ## département Systèmes Répartis Coopératifs (SRC), Université Pierre
 ## et Marie Curie.
 ##
@@ -22,7 +22,7 @@
 AM_CPPFLAGS = -I$(top_srcdir)/src $(BUDDY_CPPFLAGS) $(LIBGSPN_CPPFLAGS)
 AM_CXXFLAGS = $(WARNING_CXXFLAGS)
 
-gspndir = $(pkgincludedir)/gspn
+gspndir = $(pkgincludedir)/iface/gspn
 
 gspn_HEADERS = \
   common.hh \
diff --git a/iface/nips/Makefile.am b/iface/nips/Makefile.am
index dcb50ea13..57bc5ac54 100644
--- a/iface/nips/Makefile.am
+++ b/iface/nips/Makefile.am
@@ -22,7 +22,7 @@
 AM_CPPFLAGS = -I$(top_srcdir)/src $(BUDDY_CPPFLAGS) -I$(srcdir)/nips_vm
 AM_CXXFLAGS = $(WARNING_CXXFLAGS)
 
-nipsdir = $(pkgincludedir)/nips
+nipsdir = $(pkgincludedir)/iface/nips
 
 nips_HEADERS = \
   common.hh \