diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 743998b51..7c64f4bd0 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2009-11-20  Carsten Dominik  <carsten.dominik@gmail.com>
 
+	* org-protocol.el (org-protocol-remember): Cater for empty title,
+	region, link.
+
 	* org-agenda.el (org-agenda-diary-entry-in-org-file): Rebuild
 	agenda after adding new entry.
 	(org-agenda-get-represented-tags): New function.
diff --git a/lisp/org-protocol.el b/lisp/org-protocol.el
index 5c65fb0ef..0d40c2c78 100644
--- a/lisp/org-protocol.el
+++ b/lisp/org-protocol.el
@@ -470,9 +470,10 @@ Now template ?b will be used."
              (url (org-protocol-sanitize-uri (car parts)))
              (type (if (string-match "^\\([a-z]+\\):" url)
                        (match-string 1 url)))
-             (title (cadr parts))
-             (region (caddr parts))
-             (orglink (org-make-link-string url title))
+             (title (or (cadr parts) ""))
+             (region (or (caddr parts) ""))
+             (orglink (org-make-link-string
+		       url (if (string-match "[^[:space:]]" title) title url)))
              remember-annotation-functions)
         (setq org-stored-links
               (cons (list url title) org-stored-links))