diff --git a/.github/workflows/build_ossfuzz.yml b/.github/workflows/build_ossfuzz.yml
new file mode 100644
index 0000000..46726f7
--- /dev/null
+++ b/.github/workflows/build_ossfuzz.yml
@@ -0,0 +1,35 @@
+# Build OSSFuzz fuzz targets from source.
+name: build_ossfuzz
+on:
+  push:
+    branches: [main]
+permissions: read-all
+jobs:
+  build_ossfuzz:
+    runs-on: ubuntu-22.04
+    strategy:
+      matrix:
+        include:
+        - architecture: 'x64'
+          compiler: 'gcc'
+          configure_options: ''
+    steps:
+    - name: Install build dependencies
+      run: |
+        sudo apt-get -y install git
+    - uses: actions/checkout@v4
+      with:
+        repository: google/oss-fuzz
+        path: oss-fuzz
+    - name: Build OSSFuzz fuzz targets
+      working-directory: oss-fuzz
+      run: |
+        mkdir -p projects/libfvde
+        cp projects/libyal/build.sh projects/libfvde/
+        cp projects/libyal/project.yaml projects/libfvde/
+        head -n 20 projects/libyal/Dockerfile > projects/libfvde/Dockerfile
+        echo "RUN git clone --depth 1 https://github.com/libyal/libfvde.git libfvde" >> projects/libfvde/Dockerfile
+        tail -n 3 projects/libyal/Dockerfile >> projects/libfvde/Dockerfile
+        python3 infra/helper.py build_image --pull libfvde
+        python3 infra/helper.py build_fuzzers --sanitizer address libfvde
+        python3 infra/helper.py check_build libfvde
diff --git a/.github/workflows/build_shared.yml b/.github/workflows/build_shared.yml
index b8f39d1..6010512 100644
--- a/.github/workflows/build_shared.yml
+++ b/.github/workflows/build_shared.yml
@@ -10,9 +10,6 @@ jobs:
     strategy:
       matrix:
         include:
-        - architecture: 'x64'
-          compiler: 'gcc'
-          configure_options: ''
         - architecture: 'x64'
           compiler: 'gcc'
           configure_options: '--enable-wide-character-type'
@@ -20,7 +17,7 @@ jobs:
     - uses: actions/checkout@v4
     - name: Install build dependencies
       run: |
-        sudo apt-get -y install autoconf automake autopoint build-essential byacc flex git libssl-dev libtool pkg-config zlib1g-dev
+        sudo apt-get -y install autoconf automake autopoint build-essential byacc flex git libfuse3-dev libssl-dev libtool pkg-config zlib1g-dev
     - name: Download test data
       run: |
         if test -x "synctestdata.sh"; then ./synctestdata.sh; fi
diff --git a/appveyor.yml b/appveyor.yml
index 362a505..e7c32ca 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -267,6 +267,9 @@ install:
     Else {
       .\syncdokan.ps1 }
     }
+- ps: If (($env:BUILD_ENVIRONMENT -eq "msbuild") -And (Test-Path ".\synctestdata.ps1")) {
+    .\synctestdata.ps1 }
+- sh: if ( test ${BUILD_ENVIRONMENT} = "python-tox" || test ${BUILD_ENVIRONMENT} = "xcode" ) && test -f "./synctestdata.sh"; then ./synctestdata.sh; fi
 - cmd: if [%TARGET%]==[vs2010] (
     pushd ..\dokan &&
     set PYTHONPATH=..\vstools &&
diff --git a/configure.ac b/configure.ac
index 472c90e..4dfdd9b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ([2.71])
 
 AC_INIT(
  [libfvde],
- [20240523],
+ [20240713],
  [joachim.metz@gmail.com])
 
 AC_CONFIG_SRCDIR(
diff --git a/libfvde.ini b/libfvde.ini
index 2aea9d8..cf6daf5 100644
--- a/libfvde.ini
+++ b/libfvde.ini
@@ -5,10 +5,11 @@ authors: ["Omar Choudary <choudary.omar@gmail.com>", "Joachim Metz <joachim.metz
 year_of_creation: "2011"
 data_format: "FileVault Drive Encryption (FVDE) (or FileVault2)"
 documentation_url: "https://github.com/libyal/libfvde/tree/main/documentation"
-features: ["debug_output"]
+features: ["debug_output", "ossfuzz", "python_bindings", "tools"]
 
 [library]
 build_dependencies: ["crypto", "lex", "yacc", "zlib"]
+features: ["pthread", "wide_character_type"]
 description: "Library to access the FileVault Drive Encryption (FVDE) format"
 public_types: ["encryption_context_plist", "logical_volume", "physical_volume", "volume", "volume_group"]