diff --git a/crossguid/.footprint b/crossguid/.footprint
index d681ebd70..a2f87d23d 100644
--- a/crossguid/.footprint
+++ b/crossguid/.footprint
@@ -1,5 +1,12 @@
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/include/
--rw-r--r--	root/root	usr/include/Guid.hpp
+drwxr-xr-x	root/root	usr/include/crossguid/
+-rw-r--r--	root/root	usr/include/crossguid/guid.hpp
 drwxr-xr-x	root/root	usr/lib/
--rw-r--r--	root/root	usr/lib/libxg.a
+drwxr-xr-x	root/root	usr/lib/cmake/
+drwxr-xr-x	root/root	usr/lib/cmake/crossguid/
+-rw-r--r--	root/root	usr/lib/cmake/crossguid/crossguid-config-release.cmake
+-rw-r--r--	root/root	usr/lib/cmake/crossguid/crossguid-config.cmake
+-rw-r--r--	root/root	usr/lib/libcrossguid.a
+drwxr-xr-x	root/root	usr/lib/pkgconfig/
+-rw-r--r--	root/root	usr/lib/pkgconfig/crossguid.pc
diff --git a/crossguid/.signature b/crossguid/.signature
index 960262e69..45e08f4ea 100644
--- a/crossguid/.signature
+++ b/crossguid/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3xQS3/qiwJ8et5mEIhGVmwe2XoKB2Sm53+v1D4/qfOS7O1K5MxJNMp+rdzMhE3CKTG1uwE6X6Q+7irIANQltFQs=
-SHA256 (Pkgfile) = d93750a216ac32ea6dc5ff6c3b849fedabc1eee2edac620a9c7e9788f9d96443
-SHA256 (.footprint) = 8493818938895a7ffffb802ef89e8cc887d14324775495d043c4c0aafab78bd4
-SHA256 (crossguid-0.2.2.tar.gz) = 48321928473c682b0cdc7e17bbd3390f79f4b98ab22fef3b81a852dda81fd195
+RWSagIOpLGJF3wu94HWeHa5uo/vGGex8Pt+LMR9G/fdhwXcJUP+5AWxs2NGvqm6ODcjhBl1nqbafvHCnRylpFtYHc8O7n5S2Vgw=
+SHA256 (Pkgfile) = 09a7fd4375c5aa46be518b588956c38d77ddf329051b7fb7c6c9695011c6b0d7
+SHA256 (.footprint) = fdcd4fd2fbd24fa484f14c95b8eebd624e83e532e297e5ef66800971a14b97fa
+SHA256 (crossguid-0.2.2-2.tar.gz) = 6be27e0b3a4907f0cd3cfadec255ee1b925569e1bd06e67a4d2f4267299b69c4
diff --git a/crossguid/Pkgfile b/crossguid/Pkgfile
index c8e973d4a..185293d9a 100644
--- a/crossguid/Pkgfile
+++ b/crossguid/Pkgfile
@@ -5,18 +5,22 @@
 
 name=crossguid
 version=0.2.2
-release=1
-source=(https://github.com/graeme-hill/crossguid/archive/v$version/$name-$version.tar.gz)
+_commit=ca1bf4b810e2d188d04cb6286f957008ee1b7681
+release=2
+source=(https://github.com/graeme-hill/crossguid/archive/$_commit/$name-$version-$release.tar.gz)
 
 build() {
-  cmake -S $name-$version -B build -G Ninja \
+  sed -i 's!${CMAKE_INSTALL_DATADIR}/crossguid/cmake!${CMAKE_INSTALL_LIBDIR}/cmake/crossguid!' $name-$_commit/CMakeLists.txt
+
+  cmake -S $name-$_commit -B build -G Ninja \
     -D CMAKE_INSTALL_PREFIX=/usr \
+    -D CMAKE_INSTALL_LIBDIR=lib \
     -D CMAKE_BUILD_TYPE=Release \
     -D CMAKE_CXX_FLAGS_RELEASE="$CXXFLAGS" \
     -D CMAKE_C_FLAGS_RELEASE="$CFLAGS" \
     -Wno-dev
   cmake --build build
+  DESTDIR=$PKG cmake --build build --target install
 
-  install -D -m 0644 build/libxg.a $PKG/usr/lib/libxg.a
-  install -D -m 0644 $name-$version/Guid.hpp $PKG/usr/include/Guid.hpp
+  rm -rf $PKG/usr/share
 }