diff --git a/ChangeLog b/ChangeLog
index 3ee05f6fad66cc857e07d45562d85872471b7b37..c979cce26faabed2d938ca82e70bde93971b7220 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2013-04-16  Niels Möller  <nisse@lysator.liu.se>
 
+	* Makefile.in (TARGETS): Deleted eccdata, it should be build only
+	when public key support is enabled.
+	(clean-here): Exlicitly list it here.
+
 	* asm.m4 (m4_log2): New macro, similar to the one in gmp.
 	(ALIGN): Changed to take alignment in bytes. Updated all callers,
 	currently used only in x86 and x86_64 files.
diff --git a/Makefile.in b/Makefile.in
index 27155b2766bc1100f51694bb11513ce3807ea692..9e254f4ec3b6b5a41770c7a1b2269c029e5e1151 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -32,7 +32,7 @@ internal_SOURCES = nettle-internal.c
 internal_TARGETS = $(internal_SOURCES:.c=.$(OBJEXT))
 
 TARGETS = aesdata$(EXEEXT) desdata$(EXEEXT) twofishdata$(EXEEXT) \
-	  shadata$(EXEEXT) gcmdata$(EXEEXT) eccdata$(EXEEXT) \
+	  shadata$(EXEEXT) gcmdata$(EXEEXT) \
 	  $(getopt_TARGETS) $(internal_TARGETS) \
 	  $(LIBTARGETS) $(SHLIBTARGETS)
 IMPLICIT_TARGETS = @IF_DLL@ $(LIBNETTLE_FILE) $(LIBHOGWEED_FILE)
@@ -573,7 +573,8 @@ distcheck: dist
 
 clean-here:
 	-rm -f $(TARGETS) $(IMPLICIT_TARGETS) *.$(OBJEXT) *.p$(OBJEXT) *.s \
-		ecc-192.h ecc-224.h ecc-256.h ecc-384.h ecc-521.h eccdata.stamp
+		ecc-192.h ecc-224.h ecc-256.h ecc-384.h ecc-521.h \
+		eccdata$(EXEEXT) eccdata.stamp
 	-rm -rf .lib
 
 distclean-here: clean-here