diff --git a/Makefile b/Makefile
index 890b7b2..3551048 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,7 @@ INSTALLER_KICKSTART ?= $(INSTALLER_DIR)/conf/qubes-kickstart.cfg
 ISO_LIVEUSB ?= 0
 LIVE_KICKSTART ?= $(INSTALLER_DIR)/conf/liveusb.ks
 
-CREATEREPO := /usr/bin/createrepo
+CREATEREPO := $(shell which createrepo_c createrepo 2>/dev/null |head -1)
 
 PUNGI := /usr/bin/pungi-gather
 PUNGI_OPTS := --arch=x86_64 --greedy=none
diff --git a/yum/clean_repos.sh b/yum/clean_repos.sh
index 4ea1a9c..e28e207 100755
--- a/yum/clean_repos.sh
+++ b/yum/clean_repos.sh
@@ -1,8 +1,9 @@
+createrepo=$(which createrepo_c createrepo 2>/dev/null |head -1)
 for repo in dom0-updates installer qubes-dom0 ; do
     echo "---> Cleaning up repo: $repo..."
     rm -f $repo/rpm/*.rpm
     rm -f $repo/repodata/*
-    createrepo -q $repo
+    $createrepo -q $repo
 done
 
 
diff --git a/yum/update_repo.sh b/yum/update_repo.sh
index 20852de..2e5589e 100755
--- a/yum/update_repo.sh
+++ b/yum/update_repo.sh
@@ -1,5 +1,6 @@
 #!/bin/sh
 
+createrepo=$(which createrepo_c createrepo 2>/dev/null |head -1)
 
 # $1 -- path to rpm dir
 check_repo()
@@ -17,7 +18,7 @@ check_repo()
 
 update_repo()
 {
-    createrepo -q -g ../../conf/comps-qubes.xml --update $1
+    $createrepo -q -g ../../conf/comps-qubes.xml --update $1
 }