diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 027333d..672a07d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,7 +3,7 @@ stages:
   - bindings
 
 variables:
-  libsignal_version: "v0.9.4"
+  version: "v0.9.7"
   GRADLE_OPTS: -Dorg.gradle.daemon=false
 
 .multitarget:
@@ -24,7 +24,7 @@ compile:
     - ./prepare-env.sh
   script:
     - git clone https://github.com/signalapp/libsignal-client
-    - cd libsignal-client && git checkout "$libsignal_version"
+    - cd libsignal-client && git checkout "$version"
     - rustup target add "${TARGET}"
     - RUSTFLAGS='-C link-arg=-s' cargo build -p libsignal-jni --target "${TARGET}" --release --verbose
     - cp -v target/${TARGET}/release/libsignal_jni.so ../libsignal_jni-${TARGET}.so
@@ -37,7 +37,7 @@ compile x86_64-apple-darwin:
   tags: [darwin-builder]
   script:
     - git clone https://github.com/signalapp/libsignal-client
-    - cd libsignal-client && git checkout "$libsignal_version"
+    - cd libsignal-client && git checkout "$version"
     - RUSTFLAGS='-C link-arg=-s' cargo build -p libsignal-jni --release --verbose
     - cp -v target/release/libsignal_jni.dylib ../libsignal_jni-x86_64-apple-darwin.dylib
   artifacts:
@@ -53,7 +53,7 @@ jar:
   needs: ["compile"]
   script:
     - git clone https://github.com/signalapp/libsignal-client
-    - cd libsignal-client && git checkout "$libsignal_version"
+    - cd libsignal-client && git checkout "$version"
     - git config user.email nobody@signald.org && git config user.name signald
     - git am ../libsignal.patch
     - mkdir -p java/java/src/main/resources
@@ -68,7 +68,7 @@ jar x86_64-apple-darwin:
   needs: ["compile x86_64-apple-darwin"]
   script:
     - git clone https://github.com/signalapp/libsignal-client
-    - cd libsignal-client && git checkout "$libsignal_version"
+    - cd libsignal-client && git checkout "$version"
     - git config user.email nobody@signald.org && git config user.name signald
     - git am ../libsignal.patch
     - mkdir -p java/java/src/main/resources
diff --git a/libsignal.patch b/libsignal.patch
index 99a7207..6d4ab6b 100644
--- a/libsignal.patch
+++ b/libsignal.patch
@@ -1,50 +1,22 @@
-From aa16cda2790302d52286048afc3838b7b524df2e Mon Sep 17 00:00:00 2001
+From e87655f4171dbfb3ae9c733035d1570ccc514805 Mon Sep 17 00:00:00 2001
 From: signald <nobody@signald.org>
-Date: Sun, 24 Oct 2021 12:45:54 -0700
+Date: Tue, 26 Oct 2021 18:28:59 -0700
 Subject: [PATCH] update gradle files
 
 ---
- java/build.gradle       | 35 +--------------
- java/java/build.gradle  | 98 +++++++++--------------------------------
- java/settings.gradle    |  2 +-
- java/tests/build.gradle |  6 ---
- 4 files changed, 23 insertions(+), 118 deletions(-)
+ java/build.gradle      |  7 ----
+ java/java/build.gradle | 85 +++++++++++-------------------------------
+ java/settings.gradle   |  2 +-
+ 3 files changed, 22 insertions(+), 72 deletions(-)
 
 diff --git a/java/build.gradle b/java/build.gradle
-index 8c8eefb..f4e739f 100644
+index 8bf2a39..157de9f 100644
 --- a/java/build.gradle
 +++ b/java/build.gradle
-@@ -9,37 +9,4 @@ subprojects {
-             }
-         }
-     }
--}
--
--task makeJniLibrariesAndroid(type:Exec) {
--  group 'Rust'
--  description 'Build the JNI libraries'
--
--  commandLine './build_jni.sh', 'android'
--}
--
--task makeJniLibrariesDesktop(type:Exec) {
--  group 'Rust'
--  description 'Build the JNI libraries'
--
--  commandLine './build_jni.sh', 'desktop'
--}
--
--task clean(type: Delete) {
--  description 'Clean JNI libs'
--  delete fileTree('./android/src/main/jniLibs') {
--    include '**/*.so'
--  }
--  delete fileTree('./java/src/main/resources') {
--    include '**/*.so'
--    include '**/*.dylib'
--    include '**/*.dll'
--  }
--}
+@@ -42,10 +42,3 @@ task clean(type: Delete) {
+   }
+ }
+ clean.dependsOn(cargoClean)
 -
 -task makeAll() {
 -  group 'Rust'
@@ -52,23 +24,20 @@ index 8c8eefb..f4e739f 100644
 -
 -  dependsOn 'makeJniLibrariesDesktop', 'makeJniLibrariesAndroid'
 -}
-+}
-\ No newline at end of file
 diff --git a/java/java/build.gradle b/java/java/build.gradle
-index 2f31542..6e8f369 100644
+index 2f31542..67c4df3 100644
 --- a/java/java/build.gradle
 +++ b/java/java/build.gradle
-@@ -6,8 +6,8 @@ buildscript {
+@@ -6,7 +6,7 @@ buildscript {
  }
  
  apply plugin: 'java'
 -apply plugin: 'maven'
- apply plugin: 'signing'
 +apply plugin: 'maven-publish'
+ apply plugin: 'signing'
  
  sourceCompatibility = 1.7
- archivesBaseName = "signal-client-java"
-@@ -19,32 +19,6 @@ repositories {
+@@ -19,18 +19,6 @@ repositories {
      mavenLocal()
  }
  
@@ -84,24 +53,10 @@ index 2f31542..6e8f369 100644
 -    testCompile ('junit:junit:3.8.2')
 -}
 -
--test {
--    testLogging {
--        events 'passed'
--        showStandardStreams = true
--        showExceptions true
--        exceptionFormat 'full'
--        showCauses true
--        showStackTraces true
--    }
--
--    include 'org/whispersystems/**'
--    include 'org/signal/**'
--}
--
- def isReleaseBuild() {
-     return version.contains("SNAPSHOT") == false
- }
-@@ -67,54 +41,6 @@ signing {
+ test {
+     testLogging {
+         events 'passed'
+@@ -67,54 +55,6 @@ signing {
      sign configurations.archives
  }
  
@@ -156,13 +111,13 @@ index 2f31542..6e8f369 100644
  task packageJavadoc(type: Jar, dependsOn: 'javadoc') {
      from javadoc.destinationDir
      classifier = 'javadoc'
-@@ -133,6 +59,24 @@ artifacts {
+@@ -133,6 +73,23 @@ artifacts {
      archives packageSources
  }
  
 -tasks.withType(JavaCompile) {
 -    compileTask -> compileTask.dependsOn ':makeJniLibrariesDesktop'
-+
+-}
 +publishing {
 +    publications {
 +        library(MavenPublication) {
@@ -182,30 +137,15 @@ index 2f31542..6e8f369 100644
 +            }
 +        }
 +    }
- }
++}
+\ No newline at end of file
 diff --git a/java/settings.gradle b/java/settings.gradle
-index 7412250..4a565e5 100644
+index 7412250..4c0f3cd 100644
 --- a/java/settings.gradle
 +++ b/java/settings.gradle
 @@ -1 +1 @@
 -include ':java', ':android', ':tests'
-+include ':java', ':tests'
-diff --git a/java/tests/build.gradle b/java/tests/build.gradle
-index 013779e..aef19f2 100644
---- a/java/tests/build.gradle
-+++ b/java/tests/build.gradle
-@@ -3,10 +3,4 @@ apply plugin: 'java'
- repositories {
-     mavenCentral()
-     mavenLocal()
--}
--
--dependencies {
--    testCompile 'junit:junit:3.8.2'
--
--    compile project(':java')
- }
-\ No newline at end of file
++include ':java'
 -- 
 2.20.1