diff --git a/sysutils/dmidecode/Makefile b/sysutils/dmidecode/Makefile
index 4d9bbe27af96..c82f711e5574 100644
--- a/sysutils/dmidecode/Makefile
+++ b/sysutils/dmidecode/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	dmidecode
-PORTVERSION=	3.5
+PORTVERSION=	3.6
 CATEGORIES=	sysutils
 MASTER_SITES=	SAVANNAH
 
diff --git a/sysutils/dmidecode/distinfo b/sysutils/dmidecode/distinfo
index 69ca9e48e147..b8ff5062e2b6 100644
--- a/sysutils/dmidecode/distinfo
+++ b/sysutils/dmidecode/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1679498544
-SHA256 (dmidecode-3.5.tar.xz) = 79d76735ee8e25196e2a722964cf9683f5a09581503537884b256b01389cc073
-SIZE (dmidecode-3.5.tar.xz) = 65068
+TIMESTAMP = 1715842544
+SHA256 (dmidecode-3.6.tar.xz) = e40c65f3ec3dafe31ad8349a4ef1a97122d38f65004ed66575e1a8d575dd8bae
+SIZE (dmidecode-3.6.tar.xz) = 69284
diff --git a/sysutils/dmidecode/files/patch-Makefile b/sysutils/dmidecode/files/patch-Makefile
index 6f9d4779bdab..970524f5881f 100644
--- a/sysutils/dmidecode/files/patch-Makefile
+++ b/sysutils/dmidecode/files/patch-Makefile
@@ -1,4 +1,4 @@
---- Makefile.orig	2020-10-14 12:51:11 UTC
+--- Makefile.orig	2024-04-24 09:26:16 UTC
 +++ Makefile
 @@ -12,7 +12,7 @@
  #   (at your option) any later version.
@@ -9,7 +9,7 @@
  # Base CFLAGS can be overridden by environment
  CFLAGS ?= -O2
  # When debugging, disable -O2 and enable -g
-@@ -28,19 +28,20 @@ CFLAGS += -D_FILE_OFFSET_BITS=64
+@@ -28,20 +28,21 @@ CFLAGS += -D_FILE_OFFSET_BITS=64
  #CFLAGS += -DALIGNMENT_WORKAROUND
  
  # Pass linker flags here (can be set from environment too)
@@ -24,6 +24,8 @@
  mandir  = $(prefix)/share/man
  man8dir = $(mandir)/man8
  docdir  = $(prefix)/share/doc/dmidecode
+-compdir = $(shell pkg-config --variable=completionsdir bash-completion 2>/dev/null || echo $(prefix)/etc/bash_completion.d)
++compdir = $(prefix)/share/bash-completion/completions
  
  INSTALL         := install
 -INSTALL_DATA    := $(INSTALL) -m 644
@@ -34,3 +36,13 @@
  RM              := rm -f
  
  # BSD make provides $MACHINE, but GNU make doesn't
+@@ -146,8 +147,8 @@ install-completion :
+ 	$(RM) -r $(DESTDIR)$(docdir)
+ 
+ install-completion :
+-	if [ -d $(compdir) ] ; then \
+ 	$(INSTALL_DIR) $(DESTDIR)$(compdir) ; \
++	if [ -d $(DESTDIR)$(compdir) ] ; then \
+ 	for program in $(PROGRAMS) ; do \
+ 	$(INSTALL_DATA) completion/$$program.bash $(DESTDIR)$(compdir)/$$program ; done ; \
+ 	fi
diff --git a/sysutils/dmidecode/pkg-plist b/sysutils/dmidecode/pkg-plist
index c4308a495575..43e7931f570e 100644
--- a/sysutils/dmidecode/pkg-plist
+++ b/sysutils/dmidecode/pkg-plist
@@ -3,6 +3,10 @@ etc/periodic/daily/dmidecode
 sbin/dmidecode
 %%X86%%sbin/ownership
 %%X86%%sbin/vpddecode
+%%X86%%share/bash-completion/completions/biosdecode
+share/bash-completion/completions/dmidecode
+%%X86%%share/bash-completion/completions/ownership
+%%X86%%share/bash-completion/completions/vpddecode
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README