diff --git a/.github/workflows/build-pkgin-tags.yml b/.github/workflows/build-pkgin-tags.yml
index 5b8ada1..870824c 100644
--- a/.github/workflows/build-pkgin-tags.yml
+++ b/.github/workflows/build-pkgin-tags.yml
@@ -22,6 +22,7 @@ jobs:
           mkdir ~/.ssh
           ssh-keyscan anoncvs.netbsd.org >>~/.ssh/known_hosts
           cvs -d anoncvs@anoncvs.netbsd.org:/cvsroot co -P pkgsrc/net/libfetch/files
+          cvs -d anoncvs@anoncvs.netbsd.org:/cvsroot co -P pkgsrc/pkgtools/libnbcompat/files
           (
             cd pkgsrc/net/libfetch/files
             mkdir nbcompat
@@ -33,6 +34,11 @@ jobs:
             bmake
             bmake DESTDIR=/tmp/destdir install
           )
+          (
+            cd pkgsrc/pkgtools/libnbcompat/files
+            ./configure
+            bmake
+          )
       - name: Get tags to build
         run: |
           #tags=$(git tag | grep ^v)
@@ -40,12 +46,16 @@ jobs:
           echo "tags=$tags" >> $GITHUB_ENV
       - name: Build each tag
         run: |
+          TOPDIR=$(pwd)
           mkdir bin
           for tag in ${{ env.tags }}; do
             git checkout $tag
             mkdir build
             (
               cd build
+              env \
+                CFLAGS="-I${TOPDIR}/pkgsrc/pkgtools/libnbcompat/files" \
+                LDFLAGS="-L${TOPDIR}/pkgsrc/pkgtools/libnbcompat/files -lnbcompat" \
               ../configure \
                 --prefix=/usr/local \
                 --with-dbdir=/usr/local/.pkgdb \