diff --git a/clone_rpms.sh b/clone_rpms.sh
index e01107d..0558d91 100755
--- a/clone_rpms.sh
+++ b/clone_rpms.sh
@@ -1,12 +1,16 @@
 #!/bin/bash
 
+script_location=$( (cd $(dirname $0) && pwd) )
+
+module=$(basename $script_location)
+
 mkdir -p rpms
 pushd rpms 2>&1 >/dev/null
 
-for pkg in $(grep -B1 --no-group-separator buildorder ../tycho.yaml | grep -v buildorder | sed -e 's/:$//') ; do
+for pkg in $(grep -B1 --no-group-separator buildorder ../$module.yaml | grep -v buildorder | sed -e 's/:$//') ; do
 	if [ ! -d "$pkg" ] ; then
 		fedpkg clone $pkg
-		(cd $pkg && fedpkg switch-branch f30 && fedpkg switch-branch master && fedpkg switch-branch tycho)
+		(cd $pkg ; fedpkg switch-branch master ; fedpkg switch-branch $module)
 	fi
 done