diff --git a/rules/compat/Makefile.am b/rules/compat/Makefile.am
index 96cf388..331265a 100644
--- a/rules/compat/Makefile.am
+++ b/rules/compat/Makefile.am
@@ -5,13 +5,15 @@ transform_scripts=ln_s.sh lnv_s.sh ml_s.sh mlv_s.sh ml1_s.sh ml1v_s.sh ml1v1_s.s
 
 dist_parts=base.o_s.part
 
-if USE_COMPAT_RULES
-
-noinst_SCRIPTS=base.l2_s.part base.l3_s.part base.l4_s.part \
+scripts=base.l2_s.part base.l3_s.part base.l4_s.part \
 base.l2v2_s.part base.l3v3_s.part base.l4v4_s.part \
 base.ml_s.part base.ml1_s.part \
 base.mlv_s.part base.ml1v1_s.part \
-base.ml_s.part $(dist_parts)
+base.ml_s.part
+
+if USE_COMPAT_RULES
+
+noinst_SCRIPTS=$(scripts) $(dist_parts)
 
 else
 
@@ -50,3 +52,5 @@ base.ml1v1_s.part: ml1v1_s.sh $(transform_files)
 	sh $<
 
 EXTRA_DIST=base.lists.part $(transform_files) $(transform_scripts) $(dist_parts)
+
+CLEANFILES=$(scripts)
diff --git a/xkbrules.am b/xkbrules.am
index 1fae216..b7fc2c1 100644
--- a/xkbrules.am
+++ b/xkbrules.am
@@ -6,6 +6,10 @@ dist_dir_DATA = $(subdir).dir
 
 dirdir = $(xkb_base)
 
+.PHONY: $(subdir).dir
+
 $(subdir).dir:
 	-rm -f $@
-	here=$$(pwd); cd $(srcdir) && $(XKBCOMP) -lfhlpR -o $${here}/$@ '*'
+	$(XKBCOMP) -lfhlpR -o $@ '*'
+
+CLEANFILES=$(dist_dir_DATA)