diff --git a/nightly.sh b/nightly.sh
index ded4a05..145818a 100755
--- a/nightly.sh
+++ b/nightly.sh
@@ -8,10 +8,22 @@ TARGET_DIR="/mnt/koji/compose/rawhide"
 #OLD_COMPOSES_DIR="--old-composes=/mnt/fedora_koji/compose/f23 --old-composes=$TARGET_DIR"
 NIGHTLY="--nightly"
 SKIP_PHASES="--skip-phase=productimg"
-
+DEST=$(pwd)
+DATE=$(date "+%Y%m%d")
+COMPSFILE="fedora-24.xml"
+TMPDIR=`mktemp -d /tmp/f24.$DATE.XXXX`
 # uncomment and edit for resuming a failed compose
 #COMPOSE_ID="Fedora-23-20150530.n.0"
 
+pushd $TMPDIR
+git clone https://git.fedorahosted.org/git/comps.git && {
+    pushd comps
+    make "${COMPSFILE}"
+    cp "${COMPSFILE}" $DEST/
+    popd
+}
+popd
+
 
 CMD="pungi-koji --notification-script=/usr/bin/pungi-fedmsg-notification --config=$CONFIG --old-composes=$TARGET_DIR $OLD_COMPOSES_DIR $NIGHTLY $SKIP_PHASES"