diff --git a/koji-setup/koji-add-builder.sh b/koji-setup/koji-add-builder.sh
index fcc302f..7a28718 100644
--- a/koji-setup/koji-add-builder.sh
+++ b/koji-setup/koji-add-builder.sh
@@ -88,8 +88,12 @@ else
     sed '/^\/mnt\/koji/ s/$/ $KOJI_BUILD_FQDN(ro,no_root_squash)/' /etc/exports
 
     # Generate a certificate for the builder
+    if [ ! -f $SCRIPT_DIR/koji-gencert.sh ] ; then
+        curl $SILENT $SCRIPT_GIT/koji-gencert.sh > $SCRIPT_DIR/koji-gencert.sh
+    fi
+    cp $SCRIPT_DIR/koji-gencert.sh $KOJI_PKI_DIR/.
     pushd "$KOJI_PKI_DIR"
-    ./gencert.sh "$KOJI_BUILD_FQDN" "/C=$COUNTRY_CODE/ST=$STATE/L=$LOCATION/O=$ORGANIZATION/CN=$KOJI_BUILD_FQDN"
+    ./koji-gencert.sh "$KOJI_BUILD_FQDN" "/C=$COUNTRY_CODE/ST=$STATE/L=$LOCATION/O=$ORGANIZATION/CN=$KOJI_BUILD_FQDN"
     popd
     # generate a hub ssl key if there isn't one already (for scp & ssh to builder)
     if [ ! -f /root/.ssh/id-rsa ] ; then