diff --git a/OpenChange/GNUmakefile.preamble b/OpenChange/GNUmakefile.preamble
index 27b4b5692..7dba896b6 100644
--- a/OpenChange/GNUmakefile.preamble
+++ b/OpenChange/GNUmakefile.preamble
@@ -3,3 +3,6 @@ all:: MAPIStorePropertySelectors.m MAPIStorePropertySelectors.h
 MAPIStorePropertySelectors.m MAPIStorePropertySelectors.h: gen-property-selectors.py code-MAPIStorePropertySelectors.m code-MAPIStorePropertySelectors.h
 	@echo " Auto-generating MAPIStorePropertySelectors.[hm]..."
 	@$(PYTHON) ./gen-property-selectors.py -o MAPIStorePropertySelectors $(LIBMAPISTORE_CFLAGS)
+
+distclean clean::
+	-rm -f MAPIStorePropertySelectors.m MAPIStorePropertySelectors.h
diff --git a/SoObjects/SOGo/GNUmakefile b/SoObjects/SOGo/GNUmakefile
index f9010db09..bf2948377 100644
--- a/SoObjects/SOGo/GNUmakefile
+++ b/SoObjects/SOGo/GNUmakefile
@@ -158,6 +158,9 @@ ifeq ($(saml2_config), yes)
 SOGoSAML2Exceptions.h SOGoSAML2Exceptions.m: gen-saml2-exceptions.py
 	$(ECHO_CREATING) ./gen-saml2-exceptions.py $(LASSO_CFLAGS) $(END_ECHO)
 
+distclean clean::
+	-rm -f SOGoSAML2Exceptions.h SOGoSAML2Exceptions.m
+
 endif
 
 ifeq ($(ldap_config),yes)