diff --git a/.github/workflows/package_xml.yml b/.github/workflows/package_xml.yml
new file mode 100644
index 00000000..4bd4a9aa
--- /dev/null
+++ b/.github/workflows/package_xml.yml
@@ -0,0 +1,11 @@
+name: Validate package.xml
+
+on:
+  pull_request:
+
+jobs:
+  package-xml:
+    runs-on: ubuntu-latest
+    name: Validate package.xml
+    steps:
+      - uses: gazebo-tooling/action-gz-ci/validate_package_xml@jammy
diff --git a/av/src/AudioDecoder.cc b/av/src/AudioDecoder.cc
index a1f7b29c..a9969484 100644
--- a/av/src/AudioDecoder.cc
+++ b/av/src/AudioDecoder.cc
@@ -52,7 +52,13 @@ common::AudioDecoder::Implementation::~Implementation()
 {
   // Close the codec
   if (this->codecCtx)
+  {
+#if LIBAVFORMAT_VERSION_MAJOR < 59
     avcodec_close(this->codecCtx);
+#else
+    avcodec_free_context(&this->codecCtx);
+#endif
+  }
 
   // Close the audio file
   if (this->formatCtx)
diff --git a/av/src/Video.cc b/av/src/Video.cc
index 4958b85e..75376ae5 100644
--- a/av/src/Video.cc
+++ b/av/src/Video.cc
@@ -114,7 +114,11 @@ void Video::Cleanup()
   avformat_close_input(&this->dataPtr->formatCtx);
 
   // Close the codec
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 48, 101)
+  avcodec_free_context(&this->dataPtr->codecCtx);
+#else
   avcodec_close(this->dataPtr->codecCtx);
+#endif
 
   av_free(this->dataPtr->avFrameDst);
 }
diff --git a/package.xml b/package.xml
new file mode 100644
index 00000000..a3dbc464
--- /dev/null
+++ b/package.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<package format="2">
+  <name>gz-common5</name>
+  <version>5.6.0</version>
+  <description>Gazebo Common : AV, Graphics, Events, and much more.</description>
+  <maintainer email="natekoenig@gmail.com">Nate Koenig</maintainer>
+  <license>Apache License 2.0</license>
+  <url type="website">https://github.com/gazebosim/gz-common</url>
+
+  <buildtool_depend>cmake</buildtool_depend>
+  <buildtool_depend>pkg-config</buildtool_depend>
+
+  <build_depend>gz-cmake3</build_depend>
+
+  <depend>assimp-dev</depend>
+  <depend>ffmpeg-dev</depend>
+  <depend>gz-math7</depend>
+  <depend>gz-utils2</depend>
+  <depend>libfreeimage-dev</depend>
+  <depend>libgdal-dev</depend>
+  <depend>libgts</depend>
+  <depend>tinyxml2</depend>
+  <depend>uuid</depend>
+
+  <export>
+    <build_type>cmake</build_type>
+  </export>
+</package>