diff --git a/audio/murmur/Makefile b/audio/mumble-server/Makefile
rename from audio/murmur/Makefile
rename to audio/mumble-server/Makefile
diff --git a/audio/murmur/distinfo b/audio/mumble-server/distinfo
rename from audio/murmur/distinfo
rename to audio/mumble-server/distinfo
diff --git a/audio/murmur/files/murmur.in b/audio/mumble-server/files/mumble_server.in
rename from audio/murmur/files/murmur.in
rename to audio/mumble-server/files/mumble_server.in
diff --git a/audio/murmur/pkg-descr b/audio/mumble-server/pkg-descr
rename from audio/murmur/pkg-descr
rename to audio/mumble-server/pkg-descr
diff --git a/audio/murmur/pkg-plist b/audio/mumble-server/pkg-plist
rename from audio/murmur/pkg-plist
rename to audio/mumble-server/pkg-plist
diff --git a/audio/murmur/files/patch-initialize-SSL b/audio/murmur/files/patch-initialize-SSL
deleted file mode 100644
--- a/audio/murmur/files/patch-initialize-SSL
+++ /dev/null
@@ -1,34 +0,0 @@
-Description: the SSL library must be initialized, otherwise mumble and
-   mumble-server both fail to find the available ciphers after a rebuild
-   with openssl_1.0.2d-3.  The two calls used are based on:
-     https://wiki.openssl.org/index.php/SSL/TLS_Client#Initialization
-Author: Colomban Wendling <lists.ban@herbesfolles.org>
-        Christohper Knadle <Chris.Knadle@coredump.us>
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=804363
-Bug-Mumble: https://github.com/mumble-voip/mumble/issues/1876
-Last-Updated: 2015-11-10
-
---- src/mumble/main.cpp.orig	2019-08-30 01:01:56 UTC
-+++ src/mumble/main.cpp
-@@ -132,6 +132,9 @@ int main(int argc, char **argv) {
- 
- 	os_init();
- 
-+	SSL_library_init();
-+	SSL_load_error_strings();
-+
- 	bool bAllowMultiple = false;
- 	bool suppressIdentity = false;
- 	bool customJackClientName = false;
---- src/murmur/main.cpp.orig	2019-08-30 01:01:56 UTC
-+++ src/murmur/main.cpp
-@@ -205,6 +205,9 @@ int main(int argc, char **argv) {
- 	QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8"));
- #endif
- 
-+	SSL_library_init();
-+	SSL_load_error_strings();
-+
- #ifdef Q_OS_WIN
- 	// By default, windbus expects the path to dbus-daemon to be in PATH, and the path
- 	// should contain bin\\, and the path to the config is hardcoded as ..\etc
diff --git a/audio/murmur/files/patch-scripts_murmur.ini b/audio/murmur/files/patch-scripts_murmur.ini
deleted file mode 100644
--- a/audio/murmur/files/patch-scripts_murmur.ini
+++ /dev/null
@@ -1,18 +0,0 @@
---- scripts/murmur.ini.orig	2020-09-04 21:33:39 UTC
-+++ scripts/murmur.ini
-@@ -93,13 +93,13 @@ icesecretwrite=
- ; logs to the file 'murmur.log'. If you leave this field blank
- ; on Unix-like systems, Murmur will force itself into foreground
- ; mode which logs to the console.
--;logfile=murmur.log
-+logfile=/var/log/murmur/murmur.log
- 
- ; If set, Murmur will write its process ID to this file
- ; when running in daemon mode (when the -fg flag is not
- ; specified on the command line). Only available on
- ; Unix-like systems.
--;pidfile=
-+pidfile=/var/run/murmur/murmur.pid
- 
- ; The below will be used as defaults for new configured servers.
- ; If you're just running one server (the default), it's easier to
diff --git a/audio/murmur/files/patch-src_SelfSignedCertificate.cpp b/audio/murmur/files/patch-src_SelfSignedCertificate.cpp
deleted file mode 100644
--- a/audio/murmur/files/patch-src_SelfSignedCertificate.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/SelfSignedCertificate.cpp.orig	2023-06-11 17:43:07 UTC
-+++ src/SelfSignedCertificate.cpp
-@@ -45,10 +45,12 @@ bool SelfSignedCertificate::generate(CertificateType c
- 	QString commonName;
- 	bool isServerCert = certificateType == CertificateTypeServerCertificate;
- 
-+#ifdef CRYPTO_MEM_CHECK_ON
- 	if (CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON) == -1) {
- 		ok = false;
- 		goto out;
- 	}
-+#endif
- 
- 	x509 = X509_new();
- 	if (x509 == NULL) {