diff --git a/radix/packages/wm.scm b/radix/packages/wm.scm
index f19f163..513f1dc 100644
--- a/radix/packages/wm.scm
+++ b/radix/packages/wm.scm
@@ -78,8 +78,9 @@ than padding, gap size modification at run time, and smart gaps.")
                    (string-append "PREFIX=" (assoc-ref %outputs "out")))
            #:phases
            #~(modify-phases %standard-phases
+               (delete 'check)
                (delete 'configure))))
-   (inputs
+   (native-inputs
      (list guile-3.0
            guile-config
            pkg-config
@@ -92,3 +93,39 @@ demands.
 The ultimate aim of riverguile is to allow comfortable scripting in the context
 of desktop operations, including window management.")
    (license license:gpl3)))
+
+(define-public river-bnf
+  (package
+    (name "river-bnf")
+    (version "0.1.0")
+    (source
+     (origin
+      (method git-fetch)
+      (uri (git-reference
+            (url "https://git.sr.ht/~leon_plickat/river-bnf")
+            (commit "bb8ded380ed5d539777533065b4fd33646ad5603")
+            (recursive? #t)))
+      (file-name (git-file-name name version))
+      (sha256
+       (base32 "1iaxfj1n0pvw483385aqnc0493m78s093svw758az0lbfnvlsvxf"))))
+   (build-system gnu-build-system)
+   (arguments
+     (list #:tests? #f
+           #:make-flags
+           #~(list (string-append "CC=" #$(cc-for-target))
+                   (string-append "PREFIX=" (assoc-ref %outputs "out")))
+           #:phases
+           #~(modify-phases %standard-phases
+               (delete 'configure))))
+   (native-inputs
+     (list guile-3.0
+           guile-config
+           pkg-config
+           wayland))
+   (home-page "https://git.sr.ht/~leon_plickat/river-bnf")
+   (synopsis "Switch back'n'forth between river tags.")
+   (description "A tool for the river Wayland compositor which implements the
+\"back-and-forth\" functionality for tag switching which is common in similar
+desktops. Trying to focus a tag will focus it, unless it is already focused in
+which case the previously focused tags are focused again.")
+   (license license:gpl3)))