diff --git a/CHANGELOG.md b/CHANGELOG.md
index fc93ea014..7f1617882 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,11 @@ Until May 2022 (inclusive) no changelog was kept. We might try to reconstruct it
 
 ## Unreleased
 
+### Changed
+
+* yaml-cpp: Upgrade to 0.9.0 to fix issue with modern gcc https://github.com/jbeder/yaml-cpp/issues/1307
+* xrootd: Add dist-packages as a possible location for python bindings
+
 ## [26.04](https://github.com/ShipSoft/shipdist/tree/26.04)
 
 ### Added
diff --git a/xrootd.sh b/xrootd.sh
index f180eeacb..4861c780e 100644
--- a/xrootd.sh
+++ b/xrootd.sh
@@ -93,9 +93,14 @@ if [[ "$XROOTD_PYTHON" == "True" ]]; then
 
     # Print found XRootD python bindings
     # just run the the command as this is under "bash -e"
-    echo -ne ">>>>>>   Found XRootD python bindings: "
-    LD_LIBRARY_PATH="$INSTALLROOT/lib${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" PYTHONPATH="$INSTALLROOT/lib/python/site-packages${PYTHONPATH:+:}$PYTHONPATH" ${PYTHON_EXECUTABLE} -c 'from XRootD import client as xrd_client;print(f"{xrd_client.__version__}\n{xrd_client.__file__}");'
-    echo
+    if [ -d "$INSTALLROOT/lib/python/dist-packages" ]; then
+     XROOTD_PYTHON_PKG_DIR="dist-packages"
+    else
+     XROOTD_PYTHON_PKG_DIR="site-packages"
+    fi
+     echo -ne ">>>>>>   Found XRootD python bindings: "
+     LD_LIBRARY_PATH="$INSTALLROOT/lib${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" PYTHONPATH="$INSTALLROOT/lib/python/${XROOTD_PYTHON_PKG_DIR}${PYTHONPATH:+:}$PYTHONPATH" ${PYTHON_EXECUTABLE} -c 'from XRootD import client as xrd_client;print(f"{xrd_client.__version__}\n{xrd_client.__file__}");'
+     echo
 
 fi  # end of PYTHON part
 
@@ -108,7 +113,7 @@ alibuild-generate-module --bin --lib > "$MODULEFILE"
 
 cat >> "$MODULEFILE" <<EoF
 if { $XROOTD_PYTHON } {
-  prepend-path PYTHONPATH \$PKG_ROOT/lib/python/site-packages
+  prepend-path PYTHONPATH \$PKG_ROOT/lib/python/${XROOTD_PYTHON_PKG_DIR}
   module load ${PYTHON_REVISION:+Python/$PYTHON_VERSION-$PYTHON_REVISION}
 }
 EoF
diff --git a/yaml-cpp.sh b/yaml-cpp.sh
index 0b290a63b..512763d17 100644
--- a/yaml-cpp.sh
+++ b/yaml-cpp.sh
@@ -1,6 +1,6 @@
 package: yaml-cpp
 version: "%(tag_basename)s"
-tag: 0.8.0
+tag: yaml-cpp-0.9.0
 source: https://github.com/jbeder/yaml-cpp
 build_requires:
   - CMake