diff --git a/scribble-lib/scriblib/bibtex.rkt b/scribble-lib/scriblib/bibtex.rkt
index 90138639..4aae40f4 100644
--- a/scribble-lib/scriblib/bibtex.rkt
+++ b/scribble-lib/scriblib/bibtex.rkt
@@ -225,8 +225,9 @@
               (author-name (trim one) (trim two) #:suffix (trim suffix))]
              [(pregexp #px"^(.*),(.*)$" (list _ two one))
               (author-name (string-trim one) (string-trim two))]
-             [(pregexp #px"^(.*) (von|de la|van der) (.*)$" (list _ one von-like two))
-              (author-name (string-trim one) (string-append von-like " " (string-trim two)))]
+             [(pregexp #px"^(.*?)\\s+(\\p{Ll}[^\\s]*(\\s+\\p{Ll}[^\\s]*)*)\\s+(.*)$" (list _ one von-like _ two))
+              (author-name (string-trim one)
+                           (string-append (string-trim von-like) " " (string-trim two)))]
              [space-separated
               (match (regexp-split #px"\\s+" space-separated)
                 [(list one) (org-author-name one)]
@@ -380,6 +381,24 @@
    (authors
     (author-name "James Jack" "van der Earl Jones")))
 
+  (check
+   print-as-equal-string?
+   (parse-author "James Jack von de la Earl Jones")
+   (authors
+    (author-name "James Jack" "von de la Earl Jones")))
+
+  (check
+   print-as-equal-string?
+   (parse-author "James Jack di Earl Jones")
+   (authors
+    (author-name "James Jack" "di Earl Jones")))
+
+  (check
+   print-as-equal-string?
+   (parse-author "First fOn bER Last")
+   (authors
+    (author-name "First" "fOn bER Last")))
+
   (check
    print-as-equal-string?
    (parse-author "Deci, Edward L. and Robert J. Vallerand and Pelletier, Luc G. and Ryan, Jr, Richard M.")