diff --git a/audio/headsetcontrol/Makefile b/audio/headsetcontrol/Makefile
index 489bb2904b71..cfe9724ffef7 100644
--- a/audio/headsetcontrol/Makefile
+++ b/audio/headsetcontrol/Makefile
@@ -1,22 +1,23 @@
 PORTNAME=	headsetcontrol
-PORTVERSION=	2.6
+DISTVERSION=	2.6.1
 CATEGORIES=	audio
 
 MAINTAINER=	Alexander88207@protonmail.com
-COMMENT=	Tool to setup sidetone for various gaming headsets
+COMMENT=	Tool to control certain aspects of USB-connected headsets
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/license
 
 BUILD_DEPENDS=	hidapi>=0:comms/hidapi
 LIB_DEPENDS=	libhidapi.so:comms/hidapi
 
 USES=		cmake
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Sapd
 GH_PROJECT=	HeadsetControl
+GH_TAGNAME=	5deb75a
 
 PLIST_FILES=	${LOCALBASE}/bin/headsetcontrol
 
 .include <bsd.port.mk>
diff --git a/audio/headsetcontrol/distinfo b/audio/headsetcontrol/distinfo
index c1e3bec6b60d..8c240f927f22 100644
--- a/audio/headsetcontrol/distinfo
+++ b/audio/headsetcontrol/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1636804595
-SHA256 (Sapd-HeadsetControl-2.6_GH0.tar.gz) = 4f785af09cbf3dffe7050029f310b77943d68612a4e7544118cddb8f682eadc6
-SIZE (Sapd-HeadsetControl-2.6_GH0.tar.gz) = 39694
+TIMESTAMP = 1658658191
+SHA256 (Sapd-HeadsetControl-2.6.1-5deb75a_GH0.tar.gz) = 9842d295f69ce4109b00325fb0f1c7d35d3f0a5f83d68854ae8b67931dbd07bd
+SIZE (Sapd-HeadsetControl-2.6.1-5deb75a_GH0.tar.gz) = 44448
diff --git a/audio/headsetcontrol/files/patch-CMakeLists.txt b/audio/headsetcontrol/files/patch-CMakeLists.txt
deleted file mode 100644
index c8f2cdeba868..000000000000
--- a/audio/headsetcontrol/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,24 +0,0 @@
---- CMakeLists.txt.orig	2021-11-13 11:33:58 UTC
-+++ CMakeLists.txt
-@@ -118,21 +118,6 @@ target_link_libraries(headsetcontrol m ${HIDAPI_LIBRAR
- 
- install(TARGETS headsetcontrol DESTINATION bin)
- 
--# install udev files on linux
--if(UNIX AND NOT APPLE)
--    set(rules_file 70-headsets.rules)
--    set(udev_rules_dir lib/udev/rules.d/
--        CACHE PATH "Path to the directory where udev rules should be installed")
--    add_custom_command(
--        OUTPUT ${rules_file}
--        COMMAND headsetcontrol -u > ${rules_file}
--        DEPENDS headsetcontrol)
--    add_custom_target(udevrules ALL DEPENDS ${rules_file})
--    install(
--        FILES ${CMAKE_CURRENT_BINARY_DIR}/${rules_file}
--        DESTINATION ${udev_rules_dir})
--endif()
--
- 
- # ------------------------------------------------------------------------------
- # Testing
diff --git a/audio/headsetcontrol/pkg-descr b/audio/headsetcontrol/pkg-descr
index 4d01ca330545..a11e9ca0e2a1 100644
--- a/audio/headsetcontrol/pkg-descr
+++ b/audio/headsetcontrol/pkg-descr
@@ -1,3 +1,12 @@
-HeadsetControl allows you to setup sidetone for various of gaming headsets.
+A tool to control certain aspects of USB-connected headsets.
+
+Currently, support is provided for
+
+- Adjusting sidetone
+- Getting battery state
+- Controlling LEDs
+- Setting the inactive time.
+
+See the link below for which headset supports which feature.
 
 WWW: https://github.com/Sapd/HeadsetControl
diff --git a/audio/headsetcontrol/pkg-message b/audio/headsetcontrol/pkg-message
index 8a2ecbd856e5..2cceb20143c7 100644
--- a/audio/headsetcontrol/pkg-message
+++ b/audio/headsetcontrol/pkg-message
@@ -1,19 +1,33 @@
 [
 {
   message: <<EOM
 Type headsetcontrol -h to get all available options.
 
+Type headsetcontrol -? to get a list of supported capabilities for the currently detected headset.
+
 headsetcontrol -s 128 sets the sidetone to 128 (REAL loud). You can silence it with 0. I recommend a loudness of 16.
 
-Following options don't work on all devices yet:
+The following options don't work on all devices yet:
 
 headsetcontrol -b check battery level. Returns a value from 0 to 100 or loading.
 
 headsetcontrol -n 0|1 sends a notification sound, made by the headset. 0 or 1 are currently supported as values.
 
 headsetcontrol -l 0|1 switches LED off/on (off almost doubles battery lifetime!).
 
-headsetcontrol -c cut unnecessary output, for reading by other scripts or applications.
+headsetcontrol --short-output cut unnecessary output, for reading by other scripts or applications.
+
+headsetcontrol -i 0-90 sets inactive time in minutes, time must be between 0 and 90, 0 disables the feature.
+
+headsetcontrol -m retrieves the current chat-mix-dial level setting between 0 and 128. Below 64 is the game side and above is the chat side.
+
+headsetcontrol -v 0|1 turn voice prompts on or off.
+
+headsetcontrol -r 0|1 turn rotate to mute feature on or off.
+
+headsetcontrol --dev Advanced menu for developers, to send and/or receive custom data
+
+headsetcontrol -p 0-3 sets equalizer preset, must be between 0 and 3, 0 is the default preset.
 EOM
 }
 ]