diff --git a/docker/vllm/llm-d/genpatch.sh b/docker/vllm/llm-d/genpatch.sh
index f6ac7207..aa0331cf 100755
--- a/docker/vllm/llm-d/genpatch.sh
+++ b/docker/vllm/llm-d/genpatch.sh
@@ -5,26 +5,26 @@ set -e
 SCRIPTDIR=$(cd $(dirname "$0") && pwd)
 
 SPANS_VLLM_FORK=https://github.com/starpit/vllm-ibm.git
-SPANS_VLLM_BRANCH=spnl-ibm
+SPANS_VLLM_BRANCH=spnl-ibm-3
+SPANS_VLLM_BASE=1892993bc1
 
 . "$SCRIPTDIR/defaults.env"
-BASE_VLLM_FORK=https://github.com/$VLLM_ORG/$VLLM_REPO.git
-BASE_VLLM_COMMIT_SHA=$VLLM_COMMIT_SHA
+#BASE_VLLM_FORK=https://github.com/$VLLM_ORG/$VLLM_REPO.git
+#BASE_VLLM_COMMIT_SHA=$VLLM_COMMIT_SHA
 
-T=vllm
-#trap "rm -rf $T" EXIT
+T=$(mktemp -d)
+trap "rm -rf $T" EXIT
 
-git clone $BASE_VLLM_FORK $T/vllm-llmd
-cd $T/vllm-llmd
-git fetch origin $BASE_VLLM_COMMIT_SHA
-git checkout -q $BASE_VLLM_COMMIT_SHA
-BASE_VLLM_REVISION=$BASE_VLLM_COMMIT_SHA
+git clone $SPANS_VLLM_FORK -b $SPANS_VLLM_BRANCH $T/vllm-ibm
+cd $T/vllm-ibm
 
-git remote add spans $SPANS_VLLM_FORK
-git fetch spans $SPANS_VLLM_BRANCH
-
-git rebase spans/$SPANS_VLLM_BRANCH -C0 
+#git clone $BASE_VLLM_FORK $T/vllm-llmd
+#cd $T/vllm-llmd
+#git fetch origin $BASE_VLLM_COMMIT_SHA
+#git checkout -q $BASE_VLLM_COMMIT_SHA
+#BASE_VLLM_REVISION=$BASE_VLLM_COMMIT_SHA
+#git apply $T/spans.patch
 
 # Notes: gzip --no-name ensures deterministic output (gzip won't save mtime in the file); this helps with git sanity
 mkdir -p "$SCRIPTDIR"/patches/$LLMD_VERSION
-git diff $BASE_VLLM_REVISION | gzip --no-name -c > "$SCRIPTDIR"/patches/$LLMD_VERSION/01-spans-llmd-vllm.patch.gz
+(cd $T/vllm-ibm && git diff $SPANS_VLLM_BASE..HEAD | gzip --no-name -c > "$SCRIPTDIR"/patches/$LLMD_VERSION/01-spans-llmd-vllm.patch.gz)
diff --git a/docker/vllm/llm-d/patches/0.5.0/01-spans-llmd-vllm.patch.gz b/docker/vllm/llm-d/patches/0.5.0/01-spans-llmd-vllm.patch.gz
index e7fa2e27..a88a1c98 100644
Binary files a/docker/vllm/llm-d/patches/0.5.0/01-spans-llmd-vllm.patch.gz and b/docker/vllm/llm-d/patches/0.5.0/01-spans-llmd-vllm.patch.gz differ