diff --git a/lisp/org-protocol.el b/lisp/org-protocol.el
index 1593764..b368602 100644
--- a/lisp/org-protocol.el
+++ b/lisp/org-protocol.el
@@ -335,23 +335,18 @@ Now template ?b will be used."
                      (match-string 1 url)))
            (title (cadr parts))
            (region (caddr parts))
-           orglink)
+           orglink
+           remember-annotation-functions)
       (setq orglink (org-make-link-string url title))
-      (org-store-link-props :type type
-                            :link url
-                            :region region
-                            :description title)
       (setq org-stored-links
             (cons (list url title) org-stored-links))
-      ;; FIXME can't access %a in the template -- how to set annotation?
-      (raise-frame)
       (kill-new orglink)
-      (set-buffer b)
-      (insert region)
-      (mark-whole-buffer)
-      (org-remember nil (string-to-char template))
-      (kill-buffer b))
-    (message "Org-mode not loaded."))
+      (org-store-link-props :type type
+                            :link url
+                            :description title
+                            :initial region)
+      (raise-frame)
+      (org-remember nil (string-to-char template))))
   nil)