diff --git a/srcpkgs/f3/patches/fix-compile-flags.patch b/srcpkgs/f3/patches/fix-compile-flags.patch
deleted file mode 100644
index 964f7e6ebfa..00000000000
--- a/srcpkgs/f3/patches/fix-compile-flags.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- Makefile.orig
-+++ Makefile
-@@ -1,5 +1,5 @@
- CC ?= gcc
--CFLAGS += -std=c99 -Wall -Wextra -pedantic -MMD -ggdb
-+override CFLAGS += -std=c99 -Wall -Wextra -pedantic -MMD -ggdb
- 
- TARGETS = f3write f3read
- EXPERIMENTAL_TARGETS = f3probe f3brew f3fix
-@@ -23,10 +23,10 @@
- 	$(INSTALL) -oroot -groot -m755 $(EXPERIMENTAL_TARGETS) $(PREFIX)/bin
- 
- f3write: utils.o f3write.o
--	$(CC) -o $@ $^ -lm
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ -lm
- 
- f3read: utils.o f3read.o
--	$(CC) -o $@ $^
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ 
- 
- f3probe: libutils.o libdevs.o libprobe.o f3probe.o
- 	$(CC) -o $@ $^ -lm -ludev
diff --git a/srcpkgs/f3/template b/srcpkgs/f3/template
index b77c49dc262..22a58c3e9df 100644
--- a/srcpkgs/f3/template
+++ b/srcpkgs/f3/template
@@ -1,15 +1,24 @@
 # Template file for 'f3'
 pkgname=f3
-version=6.0
+version=7.0
 revision=1
 build_style=gnu-makefile
+make_build_target="all extra"
+make_install_target="install install-extra"
+makedepends="eudev-libudev-devel libparted-devel"
 short_desc="Test real flash memory capacity"
 maintainer="bra1nwave <brainwave@openmailbox.org>"
 license="GPL-3"
 homepage="https://github.com/AltraMayor/f3"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=d72addb15809bc6229a08ac57e2b87b34eac80346384560ba1f16dae03fbebd5
+checksum=1aaf63cf73869633e7e03a2e12561a9af0b0fbba013a94b94e78d2868f441d71
 
-do_install() {
-	make PREFIX="${DESTDIR}/usr" install
+case "$XBPS_TARGET_MACHINE" in
+	*-musl) makedepends+=" argp-standalone"
+		LDFLAGS=" -largp"
+		;;
+esac
+
+post_extract() {
+	sed -i 's/^\(CFLAGS *+=\)/override \1/' Makefile
 }