diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 00000000..12301490
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
diff --git a/.github/workflows/coverity.yml b/.github/workflows/coverity.yml
new file mode 100644
index 00000000..38ec1288
--- /dev/null
+++ b/.github/workflows/coverity.yml
@@ -0,0 +1,49 @@
+name: coverity
+
+on:
+  push:
+    branches: [ coverity ]
+
+jobs:
+  scan:
+    runs-on: ubuntu-latest
+    env:
+      TOKEN: ${{ secrets.COVERITY_SCAN_TOKEN }}
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Cache Coverity build tool
+      uses: actions/cache@v3
+      with:
+        path: |
+          coverity_tool.tar.gz
+        key: ${{ runner.os }}
+
+    - name: Download Coverity build tool
+      run: |
+        wget -c -N https://scan.coverity.com/download/linux64 --post-data "token=$TOKEN&project=libde265" -O coverity_tool.tar.gz
+        mkdir coverity_tool
+        tar xzf coverity_tool.tar.gz --strip 1 -C coverity_tool
+
+    - name: Install dependencies
+      run: |
+        ./scripts/ci-before-install-linux.sh
+
+    - name: Prepare CI
+      run: |
+        ./scripts/ci-before-script.sh
+
+    - name: Build with Coverity build tool
+      run: |
+        export PATH=`pwd`/coverity_tool/bin:$PATH
+        cov-build --dir cov-int make
+
+    - name: Submit build result to Coverity Scan
+      run: |
+        tar czvf libde265.tar.gz cov-int
+        curl --form token=$TOKEN \
+          --form email=opensource@struktur.de \
+          --form file=@libde265.tar.gz \
+          --form version="Commit $GITHUB_SHA" \
+          --form description="Build submitted via CI" \
+          https://scan.coverity.com/builds?project=libde265
diff --git a/CMakeLists.txt b/CMakeLists.txt
index bd786d53..f3e6c489 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -68,6 +68,13 @@ if(MSVC)
   add_definitions(-DHAVE_STDBOOL_H)
 endif()
 
+option(ENABLE_DECODER "Enable Decoder" ON)
+option(ENABLE_ENCODER "Enable Encoder" OFF)
+
 add_subdirectory (libde265)
-add_subdirectory (dec265)
-add_subdirectory (enc265)
+if (ENABLE_DECODER)
+  add_subdirectory (dec265)
+endif()
+if (ENABLE_ENCODER)
+  add_subdirectory (enc265)
+endif()
diff --git a/Makefile.am b/Makefile.am
index bbacd3f8..b4098f8c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,7 +22,10 @@ endif
 EXTRA_DIST = \
   autogen.sh \
   build.bat \
+  m4/ax_compare_version.m4 \
+  m4/ax_cxx_compile_stdcxx_11.m4 \
   m4/m4_ax_check_compile_flag.m4 \
+  m4/visibility.m4 \
   Makefile.vc7 \
   CMakeLists.txt \
   README.md \