diff --git a/guix/build/emacs-build-system.scm b/guix/build/emacs-build-system.scm
index cb5bde31911b7f2acabfa80e4b1a327cf44408a1..f0a9a6e1256e0f62c89151f8d93275546b858100 100644
--- a/guix/build/emacs-build-system.scm
+++ b/guix/build/emacs-build-system.scm
@@ -138,10 +138,9 @@ (define (emacs-inputs-el-directories dirs)
 (define (package-name-version->elpa-name-version name-ver)
   "Convert the Guix package NAME-VER to the corresponding ELPA name-version
 format.  Essnetially drop the prefix used in Guix."
-  (let ((name (strip-store-file-name name-ver)))
-    (if (emacs-package? name-ver)
-        (strip-store-file-name name-ver)
-        name-ver)))
+  (if (emacs-package? name-ver)  ; checks for "emacs-" prefix
+      (string-drop name-ver (string-length "emacs-"))
+      name-ver))
 
 (define (store-directory->elpa-name-version store-dir)
   "Given a store directory STORE-DIR return the part of the basename after the