diff --git a/Makefile b/Makefile
index 7ab60e0..514a7b0 100644
--- a/Makefile
+++ b/Makefile
@@ -127,6 +127,7 @@ update-repo-unstable:
 
 iso:
 	ln -sf `pwd` /tmp/qubes-installer
+	createrepo -q -g ../../conf/comps-qubes.xml --update yum/qubes-dom0
 	mkdir -p work
 	pushd work && pungi --name=Qubes  $(PUNGI_OPTS) -c $(PWD)/conf/qubes-kickstart.cfg && popd
 	./rpm_verify work/$(ISO_VERSION)/x86_64/os/Packages/*/*.rpm
@@ -135,7 +136,7 @@ iso:
 	mv work/$(ISO_VERSION)/x86_64/iso/*-DVD.iso build/ISO/qubes-x86_64/iso/
 	rm -rf build/work/$(ISO_VERSION)
 	mv work/$(ISO_VERSION)/x86_64/os build/work/$(ISO_VERSION)
-	chown --reference=Makefile -R build
+	chown --reference=Makefile -R build yum
 	rm -rf work
 
 clean-repos: