diff --git a/o2pdpsuite.sh b/o2pdpsuite.sh
index d3edfdf8aa..e0aeb8b115 100644
--- a/o2pdpsuite.sh
+++ b/o2pdpsuite.sh
@@ -11,35 +11,16 @@ requires:
   - O2DPG
   - O2sim
   - "ODC:(?!osx|slc9_aarch64)"
+build_requires:
+  - alibuild-recipe-tools
 valid_defaults:
   - o2
   - o2-dataflow
   - o2-epn
   - ali
 ---
-#!/bin/bash -ex
-
-MODULEFILE_DEPS=
-for RPKG in $REQUIRES; do
-  [[ $RPKG != defaults* ]] || continue
-  RPKG_UP=$(echo $RPKG|tr '[:lower:]' '[:upper:]'|tr '-' '_')
-  RPKG_VERSION=$(eval echo "\$${RPKG_UP}_VERSION")
-  RPKG_REVISION=$(eval echo "\$${RPKG_UP}_REVISION")
-  MODULEFILE_DEPS="${MODULEFILE_DEPS} ${RPKG}/${RPKG_VERSION}-${RPKG_REVISION}"
-done
-MODULEFILE_DEPS=$(echo $MODULEFILE_DEPS)
-
 # Modulefile
-mkdir -p $INSTALLROOT/etc/modulefiles
-cat > $INSTALLROOT/etc/modulefiles/$PKGNAME <<EoF
-#%Module1.0
-proc ModulesHelp { } {
-  global version
-  puts stderr "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
-}
-set version $PKGVERSION-@@PKGREVISION@$PKGHASH@@
-module-whatis "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
-
-# Dependencies
-module load BASE/1.0 ${MODULEFILE_DEPS}
-EoF
+MODULEDIR="$INSTALLROOT/etc/modulefiles"
+MODULEFILE="$MODULEDIR/$PKGNAME"
+mkdir -p "$MODULEDIR"
+alibuild-generate-module > "$MODULEFILE"