diff --git a/lisp/org-protocol.el b/lisp/org-protocol.el
index 23a146a87..4f644a73e 100644
--- a/lisp/org-protocol.el
+++ b/lisp/org-protocol.el
@@ -277,7 +277,9 @@ decode each split part."
   (let* ((sep (or separator "/+"))
          (split-parts (split-string data sep)))
     (if unhexify
-        (mapcar 'url-unhex-string split-parts)
+	(if (fboundp unhexify)
+	    (mapcar unhexify split-parts)
+	  (mapcar 'org-protocol-unhex-string split-parts))
       split-parts)))
 
 (defun org-protocol-unhex-string(str)