diff --git a/Makefile b/Makefile
index 43984b7a..e5d9ff12 100644
--- a/Makefile
+++ b/Makefile
@@ -206,11 +206,15 @@ ifeq ($(OS),Linux)
 	$(Q)/sbin/ldconfig -n $(DESTDIR)$(libdir)/libsb2
 endif
 
-CLEAN_FILES += $(targets) config.status config.log
+CLEAN_FILES += $(targets) \
+				$(OBJDIR)/include/scratchbox2_version.h
+DISTCLEAN_FILES +=	$(DIST_FILES) \
+					$(OBJDIR)/config.log \
+					$(SRCDIR)/configure
 
-superclean: clean
+distclean: clean
 	$(P)CLEAN
-	$(Q)rm -rf include/config.h config.mak
+	$(Q)rm -rf $(DISTCLEAN_FILES)
 
 clean:
 	$(P)CLEAN
diff --git a/preload/Makefile b/preload/Makefile
index 12091a2b..f53900f7 100644
--- a/preload/Makefile
+++ b/preload/Makefile
@@ -58,7 +58,7 @@ $(OBJDIR)/preload/wrappers.c: preload/interface.master preload/gen-interface.pl
 		-E $(OBJDIR)/preload/exported.h \
 		-M $(OBJDIR)/preload/export.map \
 		-V $(PACKAGE_VERSION) \
-		-m preload/libsb2_interface.7 \
+		-m $(OBJDIR)/preload/libsb2_interface.7 \
 		<$(SRCDIR)/preload/interface.master
 
 $(D)/privatewrappers.h: preload/privatewrappers.c
@@ -71,8 +71,14 @@ $(D)/privatewrappers.c: preload/interface.private preload/gen-interface.pl
 		-E $(OBJDIR)/preload/privatewrappers.h \
 		<$(SRCDIR)/preload/interface.private
 
-generated := $(OBJDIR)/preload/wrappers.c $(OBJDIR)/preload/exported.h \
-	$(OBJDIR)/preload/ldexportlist
+generated := $(OBJDIR)/preload/wrappers.c \
+			$(OBJDIR)/preload/exported.h \
+			$(OBJDIR)/preload/ldexportlist \
+			$(OBJDIR)/preload/export.map \
+			$(OBJDIR)/preload/privatewrappers.c \
+			$(OBJDIR)/preload/privatewrappers.h \
+			$(OBJDIR)/preload/libsb2_interface.7
+
 .PRECIOUS: $(generated)
 
 CLEAN_FILES += $(generated)