diff --git a/net-analyzer/munin-contrib/metadata.xml b/net-analyzer/munin-contrib/metadata.xml
index e724564c0d..e9e0aeb120 100644
--- a/net-analyzer/munin-contrib/metadata.xml
+++ b/net-analyzer/munin-contrib/metadata.xml
@@ -13,7 +13,6 @@
     <remote-id type="github">munin-monitoring/contrib</remote-id>
   </upstream>
   <use>
-    <flag name="plugins">contrib munin plugins</flag>
     <flag name="templates">contrib munin tools</flag>
     <flag name="tools">munin contrib tools</flag>
   </use>
diff --git a/net-analyzer/munin-contrib/munin-contrib-0.2024.03.04-r1.ebuild b/net-analyzer/munin-contrib/munin-contrib-0.2024.03.04-r1.ebuild
new file mode 100644
index 0000000000..aeca64064e
--- /dev/null
+++ b/net-analyzer/munin-contrib/munin-contrib-0.2024.03.04-r1.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit toolchain-funcs
+
+COMMIT="83f4e970c4a7378540057318a5083653ee2f138b"
+
+SRC_URI="https://github.com/munin-monitoring/contrib/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+DESCRIPTION="user contributed stuff related to munin"
+HOMEPAGE="https://github.com/munin-monitoring/contrib"
+LICENSE="GPL-3+ Apache-2.0 GPL-2 LGPL-2 GPL-2+ LGPL-3+ MIT" #TODO: investigate all the licenses
+SLOT="0"
+IUSE="examples templates tools"
+RDEPEND="net-analyzer/munin"
+
+S="${WORKDIR}/contrib-${COMMIT}"
+README_PLUGINS=(
+	plugins/README.md
+	plugins/apache/apache_byprojects/README.md
+	plugins/apache/apache_vhosts/README.txt
+	plugins/apt/deb_packages/README.md
+	plugins/jmx/readme.txt
+	plugins/kamailio/README.md
+	plugins/network/linux_if/README.md
+	plugins/nfs-freebsd/README.rst
+	plugins/nginx/nginx_byprojects/README.md
+	plugins/prosody/README.rst
+	plugins/rackspace/README
+	plugins/tarsnap/README.md
+	plugins/varnish/README-varnish4.md
+	plugins/varnish/README.rst
+	plugins/znc/README.md
+	plugins/zope/README-zodb
+)
+README_TOOLS=(
+	tools/munin-node-c/README
+	tools/munin-node-from-hell/README.rst
+	tools/munin-plugins-busybox/README
+	tools/pmmn/plugins/README
+	tools/pypmmn/README.rst
+)
+
+src_prepare() {
+	default
+	rm "plugins/nginx/nginx_byprojects/LICENSE.txt" || die
+}
+
+src_compile() {
+	export CC=$(tc-getCC)
+
+	pushd plugins/cpu || die
+		emake multicpu1sec-c
+		rm multicpu1sec-c.c || die
+	popd
+	pushd plugins/disk/smart-c || die
+		emake
+		rm *.h *.o *.c Makefile || die
+	popd
+	pushd plugins/network || die
+		emake if1sec-c
+		rm if1sec-c.c || die
+	popd
+}
+
+src_install() {
+	if use tools ; then
+		for i in "${README_TOOLS[@]}" ; do
+			p="${ED}/usr/share/doc/${PF}/${i%/*}"
+			mkdir -p "${p}" || die
+			mv "${i}" "${p}" || die
+		done
+		insinto "/usr/libexec/munin"
+		doins -r tools
+	fi
+
+	#install documentation in subfolders
+	for i in plugins/{apt,network,}/*/example-graphs ; do
+		p="${ED}/usr/share/doc/${PF}/${i}"x
+		mkdir -p "${p}" || die
+		mv "${i}" "${p}" || die
+	done
+	for i in "${README_PLUGINS[@]}" ; do
+		p="${ED}/usr/share/doc/${PF}/${i%/*}"
+		mkdir -p "${p}" || die
+		mv "${i}" "${p}" || die
+	done
+
+	#install plugins without getting mad at preserving exec bit
+	mkdir -p "${ED}/usr/libexec/munin/plugins/contrib" || die
+	mv plugins/* "${ED}/usr/libexec/munin/plugins/contrib" || die
+
+	elog "2023 Feb 1, the network/transmission file was replaced "
+	elog "by a directory of the same name.  You may get a file collision "
+	elog "warning because of it.  As long as you haven't made manual "
+	elog "edits to the file, you can remove the transmission.backup.#### "
+	elog "file if one is made."
+	elog
+	elog "See https://github.com/munin-monitoring/contrib/commit/2a12025ee5a22dad41be8f1c05052c2a93e3d3bd"
+
+	insinto "/etc/munin/templates"
+	use templates && doins -r templates/munstrap
+
+	use examples && dodoc -r samples/munin.conf
+
+	dodoc README.md
+}