diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
new file mode 100644
index 0000000..396e34c
--- /dev/null
+++ b/.github/workflows/build.yml
@@ -0,0 +1,39 @@
+name: Build
+
+on:
+  push:
+  pull_request:
+  schedule:
+    - cron: "0 0 * * *"
+
+jobs:
+  build:
+    runs-on: ubuntu-22.04
+
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        submodules: recursive
+
+    - name: Dependencies
+      run: |
+        sudo apt-get update -y
+        sudo apt-get install -y libssl-dev libcurl4-openssl-dev libhiredis-dev libmemcached-dev
+        sudo apt-get install -y libjansson-dev libcjose-dev apache2-dev libxml2-dev check pkg-config
+        cd /tmp
+        git clone https://github.com/zmartzone/liboauth2.git
+        cd liboauth2
+        ./autogen.sh
+        ./configure
+        make
+        sudo make install
+    - name: Configure
+      run: |
+        ./autogen.sh
+        ./configure
+
+    - name: Make
+      run: make
+
+    - name: Distcheck
+      run: make distcheck DESTDIR="/tmp/mod_sts"
diff --git a/Makefile.am b/Makefile.am
index cda5083..bac83a4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,7 +16,7 @@ includesub_HEADERS = \
 
 lib_LTLIBRARIES = @PACKAGE_NAME@.la
 
-@PACKAGE_NAME@_la_CFLAGS = @OAUTH2_CFLAGS@ @OAUTH2_APACHE_CFLAGS@ @APACHE_CFLAGS@ @XML_CFLAGS@ -Isrc/liboauth2-sts/include
+@PACKAGE_NAME@_la_CFLAGS = @OAUTH2_CFLAGS@ @OAUTH2_APACHE_CFLAGS@ @APACHE_CFLAGS@ @XML_CFLAGS@ -I${srcdir}/src/liboauth2-sts/include
 @PACKAGE_NAME@_la_LIBADD = @OAUTH2_LIBS@ @OAUTH2_APACHE_LIBS@ @APR_LIBS@ @XML_LIBS@
 @PACKAGE_NAME@_la_SOURCES = \
 	src/liboauth2-sts/src/sts_int.h \
diff --git a/README.md b/README.md
index 6a63465..5f415a6 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,5 @@
+[![Build Status](https://github.com/zmartzone/mod_sts/actions/workflows/build.yml/badge.svg)](https://github.com/zmartzone/mod_sts/actions/workflows/build.yml)
+
 # mod_sts
 A security token exchange module for Apache HTTP Server 2.x which allows for exchanging arbitrary security
 tokens by calling into a remote Security Token Service (STS).
@@ -26,8 +28,8 @@ and you don't want to enforce support for that legacy onto your external clients
 An source (or: incoming) token can be presented in a header (e.g. an `Authorization: bearer` header for
 OAuth 2.0 bearer access tokens), a query parameter or a cookie. Alternatively the token can be consumed
 from an environment variable set by a another Apache (authentication) module such as a validated access
-token set by [mod_auth_openidc](https://github.com/zmartzone/mod_auth_openidc) in OAuth 2.0 Resource
-Server mode.
+token set by [mod_oauth2](https://github.com/zmartzone/mod_oauth2) operating as an OAuth 2.0 Resource
+Server.
 
 Sample supported - incoming/external - source tokens:
 - an OAuth 2.0 bearer access token presented by an external OAuth 2.0 Client
@@ -135,11 +137,11 @@ Any questions/issues should go to issues tracker.
 #### Commercial Services
 For commercial Support contracts, Professional Services, Training and use-case specific support you can
 contact:  
-  [sales@zmartzone.eu](mailto:sales@zmartzone.eu)  
+  [sales@openidc.com](mailto:sales@openidc.com)
 
 
 Disclaimer
 ----------
-*This software is open sourced by ZmartZone IAM. For commercial support
-you can contact [ZmartZone IAM](https://www.zmartzone.eu) as described above in the [Support](#support)
+*This software is open sourced by OpenIDC. For commercial support
+you can contact [OpenIDC](https://www.openidc.com) as described above in the [Support](#support)
 section.*
diff --git a/configure.ac b/configure.ac
index 3719dc5..f653fdd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([mod_sts],[3.3.0],[hans.zandbelt@zmartzone.eu])
+AC_INIT([mod_sts],[3.3.0],[hans.zandbelt@openidc.com])
 
 AM_INIT_AUTOMAKE([foreign no-define subdir-objects])
 AC_CONFIG_MACRO_DIRS([m4])
diff --git a/src/liboauth2-sts b/src/liboauth2-sts
index 043b7d9..104588b 160000
--- a/src/liboauth2-sts
+++ b/src/liboauth2-sts
@@ -1 +1 @@
-Subproject commit 043b7d9d5028b8d2d5505bfececa449b5c921e57
+Subproject commit 104588b5f5e05112bf3bc9dc4e324e62d6a1269c
diff --git a/src/mod_sts.c b/src/mod_sts.c
index 8fb84b7..ffc61ca 100644
--- a/src/mod_sts.c
+++ b/src/mod_sts.c
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- * @Author: Hans Zandbelt - hans.zandbelt@zmartzone.eu
+ * @Author: Hans Zandbelt - hans.zandbelt@openidc.com
  *
  **************************************************************************/