diff --git a/CHANGELOG.md b/CHANGELOG.md
index bbde694b..6b4b58db 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - Update native library to Cubism 5 SDK for Native R1.
 
+- Update JavaOpenGL binding to jogl 2.5.0.
+
 - Refine CI pipeline.
   - Use GitHub shared actions for building test environment / run unit test...etc.
   - Use Debian as a building environment in GitHub Actions CI pipeline.
diff --git a/README.md b/README.md
index 4f7fbaba..896cbd6c 100644
--- a/README.md
+++ b/README.md
@@ -82,7 +82,7 @@ Since this project is built on Clean Architecture concept and runs on Java Virtu
 
 In theory, it should able to use differnt combination of OpenGL Java libary and GUI toolkit, but the examples come with this project use the following comination.
 
-Due to some weired bug, I couldn't make the example program runs on SWT under MacOS. Also, currently it only support MacOS running on Intel processors, Apple M1 version of MacOS is not supported.
+Due to some weired bug, I couldn't make the example program runs on SWT under MacOS. I've confirmed JavaOpenGL binding could work under Intel and Apple M2 chip. I don't have other Apple chips to verify, so not sure if it will work or not.
 
 | OS / Binding  | Architecture | OpenGL Binding     | GUI Toolkit |Supported          | Note
 | ------------- |------------- | ------------------ |------------ |------------------ |------
@@ -90,12 +90,11 @@ Due to some weired bug, I couldn't make the example program runs on SWT under Ma
 | Linux         | x86_64       | LWJGL              | SWT         |:heavy_check_mark: | 2
 | Windows 10    | x86_64       | JavaOpenGL         | Swing       |:heavy_check_mark: |
 | Windows 10    | x86_64       | LWJGL              | SWT         |:heavy_check_mark: |
-| MacOS         | x86_64       | JavaOpenGL         | Swing       |:heavy_check_mark: | 3
-| MacOS         | x86_64       | LWJGL              | SWT         |:x:                | 
+| MacOS         | x86_64 / M2  | JavaOpenGL         | Swing       |:heavy_check_mark: | 
+| MacOS         | x86_64 / M2  | LWJGL              | SWT         |:x:                | 
 
 1. Works both on X11 / Wayland natively.
 2. Works on X11 natively, you need set `GDK_BACKEND=x11` environment variable to make it work on Wayland.
-3. Must use jogamp-fat-v2.4.0-rc-20210111.jar, auto pull-in dependency from Maven Central will not work.
 
 Install & Usage
 --------------------
diff --git a/modules/joglBinding/build.sbt b/modules/joglBinding/build.sbt
new file mode 100644
index 00000000..e24feaba
--- /dev/null
+++ b/modules/joglBinding/build.sbt
@@ -0,0 +1,9 @@
+val joglVersion = "2.5.0"
+
+resolvers += "jogamp" at "https://jogamp.org/deployment/maven"
+
+libraryDependencies ++= Seq(
+  "org.jogamp.gluegen" % "gluegen-rt-main" % joglVersion,
+  "org.jogamp.jogl" % "jogl-all-main" % joglVersion
+)
+
diff --git a/modules/joglBinding/lib/jogamp-fat-v2.4.0-rc-20210111.jar b/modules/joglBinding/lib/jogamp-fat-v2.4.0-rc-20210111.jar
deleted file mode 100644
index 261aaa0f..00000000
Binary files a/modules/joglBinding/lib/jogamp-fat-v2.4.0-rc-20210111.jar and /dev/null differ
diff --git a/modules/joglBinding/src/test/scala/moe/brianhsu/live2d/adapter/gateway/opengl/jogl/MockedGL2.scala b/modules/joglBinding/src/test/scala/moe/brianhsu/live2d/adapter/gateway/opengl/jogl/MockedGL2.scala
index 1f9b3ce2..93de6a3d 100644
--- a/modules/joglBinding/src/test/scala/moe/brianhsu/live2d/adapter/gateway/opengl/jogl/MockedGL2.scala
+++ b/modules/joglBinding/src/test/scala/moe/brianhsu/live2d/adapter/gateway/opengl/jogl/MockedGL2.scala
@@ -4882,6 +4882,8 @@ class MockedGL2 extends GL2 {
 
   override def getDefaultDrawFramebuffer: Int = ???
 
+  override def getDefaultDrawBuffer(): Int = ???
+
   override def getDefaultReadFramebuffer: Int = ???
 
   override def getDefaultReadBuffer: Int = ???