diff --git a/ChangeLog b/ChangeLog
index 5e7971b9f62fb9ccb1297453139fe9f79b7a2360..82c14dd9b1ec315fc4daf6270b33098952addccb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2004-10-26  Niels M�ller  <nisse@lysator.liu.se>
 
+	* Released nettle-1.11.
+
+	* Makefile.in (clean-here): Delete *.s files.
+	(PRE_CPPFLAGS): Use this variable, not INCLUDES. Removed
+	-I$(srcdir). 
+
 	* x86/arcfour-crypt.asm: Use movzbl when extending %cl to 32 bits.
 
 2004-10-24  Niels M�ller  <nisse@lysator.liu.se>
diff --git a/Makefile.in b/Makefile.in
index 58e46393bcd800ec793f53ccbd3b2ce7340f63ee..924f499ce1a870425d971514aa62473d938b12de 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -11,8 +11,7 @@ SUBDIRS = tools testsuite examples
 
 include config.make
 
-# FIXME: Really need -I$(srcdir) ???
-INCLUDES = -I. -I$(srcdir)
+PRE_CPPFLAGS = -I.
 
 TARGETS = aesdata$(EXEEXT) desdata$(EXEEXT) shadata$(EXEEXT) \
 	  libnettle.a $(SHLIBTARGET) \
@@ -318,7 +317,7 @@ distcheck: dist
 	$(rm_distcheck)
 
 clean-here:
-	-rm -f $(TARGETS) *.$(OBJEXT) *.p$(OBJEXT) *.d
+	-rm -f $(TARGETS) *.$(OBJEXT) *.p$(OBJEXT) *.d *.s
 
 distclean-here: clean-here
 	-rm -f config.h stamp-h config.log config.status \