diff --git a/ChangeLog b/ChangeLog
index d61398a0f..a4da966d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-11-06  Alexandre Duret-Lutz  <adl@lrde.epita.fr>
+
+	* src/Makefile.am (libspot_la_LIBADD): Rename libneverclaimparse.la
+	as libneverparse.la.
+	* src/neverparse/Makefile.am: Install files in 
+	$(pkgincludedir)/neverparse, not $(pkgincludedir)/neverclaimparse.
+
 2010-11-06  Alexandre Duret-Lutz  <adl@lrde.epita.fr>
 
 	Cosmetics to please sanity checks.
diff --git a/src/Makefile.am b/src/Makefile.am
index a42061bac..bc78f2485 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -44,7 +44,7 @@ libspot_la_LIBADD =  \
   tgba/libtgba.la \
   tgbaalgos/libtgbaalgos.la \
   tgbaparse/libtgbaparse.la \
-  neverparse/libneverclaimparse.la \
+  neverparse/libneverparse.la \
   evtgba/libevtgba.la \
   evtgbaalgos/libevtgbaalgos.la \
   evtgbaparse/libevtgbaparse.la \
diff --git a/src/neverparse/Makefile.am b/src/neverparse/Makefile.am
index 1772c23e3..4a80ec2fa 100644
--- a/src/neverparse/Makefile.am
+++ b/src/neverparse/Makefile.am
@@ -1,4 +1,4 @@
-## Copyright (C) 2010 Laboratoire de Recherche et DĂ©veloppement
+## Copyright (C) 2010 Laboratoire de Recherche et Développement
 ## de l'Epita (LRDE).
 ##
 ## This file is part of Spot, a model checking library.
@@ -22,14 +22,14 @@ AM_CPPFLAGS = -I$(srcdir)/.. $(BUDDY_CPPFLAGS)
 # Disable -Werror because too many versions of flex yield warnings.
 AM_CXXFLAGS = $(WARNING_CXXFLAGS:-Werror=)
 
-neverclaimparsedir = $(pkgincludedir)/neverclaimparse
+neverparsedir = $(pkgincludedir)/neverparse
 
-neverclaimparse_HEADERS = \
+neverparse_HEADERS = \
   public.hh \
   location.hh \
   position.hh
 
-noinst_LTLIBRARIES = libneverclaimparse.la
+noinst_LTLIBRARIES = libneverparse.la
 
 NEVERCLAIMPARSE_YY = neverclaimparse.yy
 FROM_NEVERCLAIMPARSE_YY_MAIN = neverclaimparse.cc
@@ -56,7 +56,7 @@ $(FROM_NEVERCLAIMPARSE_YY_OTHERS): $(NEVERCLAIMPARSE_YY)
 
 EXTRA_DIST = $(NEVERCLAIMPARSE_YY)
 
-libneverclaimparse_la_SOURCES = \
+libneverparse_la_SOURCES = \
   fmterror.cc \
   $(FROM_NEVERCLAIMPARSE_YY) \
   neverclaimscan.ll \