diff --git a/CMakeLists.txt b/CMakeLists.txt
index b971994..72841c4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -56,7 +56,6 @@ find_package(CXXTerminal REQUIRED)
 find_package(StringVariable REQUIRED)
 find_package(yaml-cpp REQUIRED)
 find_package(jsoncpp REQUIRED)
-find_package(ed25519 REQUIRED)
 find_package(DataPipes REQUIRED)
 find_package(Opus REQUIRED)
 find_package(spdlog REQUIRED)
@@ -95,7 +94,6 @@ endif()
 
 #FIXME: Use module for this
 include_directories(${breakpad_INCLUDE_DIR})
-include_directories(${ed25519_INCLUDE_DIR})
 include_directories(${ThreadPool_INCLUDE_DIR})
 include_directories(${DataPipes_INCLUDE_DIR})
 include_directories(${LIBEVENT_INCLUDE_DIRS})
diff --git a/git-teaspeak b/git-teaspeak
index 7a52b2d..e6b2eed 160000
--- a/git-teaspeak
+++ b/git-teaspeak
@@ -1 +1 @@
-Subproject commit 7a52b2d2c469ece2b13ea49d017ce2d6989fea00
+Subproject commit e6b2eedde9d246948684a279871e828cca6d9f90
diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
index 04325fb..da13f24 100644
--- a/server/CMakeLists.txt
+++ b/server/CMakeLists.txt
@@ -265,7 +265,6 @@ target_link_libraries(TeaSpeakServer
         tommath::static
 
         jsoncpp_lib
-        ${Ed25519_LIBRARIES_STATIC}
         zstd::libzstd_static
 )