diff --git a/community/goimapnotify/APKBUILD b/community/goimapnotify/APKBUILD
index 9534468c8be6de1931af39ec95fc3de24180b1f3..f09ef0fa69492e523e28878b29a7f2a14a3eecf9 100644
--- a/community/goimapnotify/APKBUILD
+++ b/community/goimapnotify/APKBUILD
@@ -16,6 +16,13 @@ export GOCACHE="${GOCACHE:-"$srcdir/go-cache"}"
 export GOTMPDIR="${GOTMPDIR:-"$srcdir"}"
 export GOMODCACHE="${GOMODCACHE:-"$srcdir/go"}"
 
+prepare() {
+	default_prepare
+	go get -u golang.org/x/sys@v0.6.0
+	go get -u golang.org/x/net@v0.6.0
+	go mod tidy
+}
+
 build() {
 	export CGO_CPPFLAGS="$CPPFLAGS"
 	export CGO_CFLAGS="$CFLAGS"
@@ -23,11 +30,6 @@ build() {
 	export CGO_LDFLAGS="$LDFLAGS"
 	export GOFLAGS="$GOFLAGS -trimpath -mod=readonly -modcacherw"
 
-	# Fix build on riscv64
-	go mod edit -replace \
-		golang.org/x/sys=golang.org/x/sys@v0.0.0-20210630005230-0f9fa26af87c
-	go mod download golang.org/x/sys
-
 	go build -ldflags "-linkmode=external \"-extldflags=$LDFLAGS\""
 }