diff --git a/gnu/packages/benchmark.scm b/gnu/packages/benchmark.scm
index e3c2570ef..feed7b545 100644
--- a/gnu/packages/benchmark.scm
+++ b/gnu/packages/benchmark.scm
@@ -27,7 +27,8 @@
   #:use-module (gnu packages maths)
   #:use-module (gnu packages mpi)
   #:use-module (gnu packages python)
-  #:use-module (gnu packages storage))
+  #:use-module (gnu packages storage)
+  #:use-module (ice-9 match))
 
 (define-public fio
   (package
@@ -114,12 +115,11 @@ is to write a job file matching the I/O load one wants to simulate.")
     (source
      (origin
       (method url-fetch)
-      (uri (let* ((parts (string-split version #\.) )
-                  (major (car parts))
-                  (minor (cadr parts)))
-             (string-append
-              "https://software.intel.com/sites/default/files/managed/76/6c/IMB_"
-              major "_Update" minor ".tgz")))
+      (uri (match (string-split version #\.)
+             ((major minor)
+              (string-append
+               "https://software.intel.com/sites/default/files/managed/76/6c/IMB_"
+               major "_Update" minor ".tgz"))))
       (sha256 (base32 "11nczxm686rsppmw9gjc2p2sxc0jniv5kv18yxm1lzp5qfh5rqyb"))))
     (build-system gnu-build-system)
     (inputs
@@ -139,7 +139,7 @@ is to write a job file matching the I/O load one wants to simulate.")
          (replace 'install
            (lambda* (#:key outputs #:allow-other-keys)
              (let* ((out (assoc-ref outputs "out"))
-                    (doc (string-append out "/share/doc"))
+                    (doc (string-append out "/share/doc/" ,name))
                     (bin (string-append out "/bin")))
                (with-directory-excursion "imb/src"
                  (for-each
@@ -153,9 +153,11 @@ is to write a job file matching the I/O load one wants to simulate.")
     (home-page "https://software.intel.com/en-us/articles/intel-mpi-benchmarks")
     (synopsis "Intel MPI Benchmarks")
     (description
-     "A set of MPI performance measurements for point-to-point and global
-communication, and file, operations for a range of message sizes.
-The generated benchmark data fully characterize:
+     "This package provides benchmarks for implementations of the @dfn{Message
+Passing Interface} (MPI).  It contains MPI performance measurements for
+point-to-point and global communication, and file, operations for a range of
+message sizes.  The generated benchmark data fully characterize:
+
 @itemize
 @item
 Performance of a cluster system, including node performance, network latency,