diff --git a/cmd/tokidoki/main.go b/cmd/tokidoki/main.go
index 4774131..c41f803 100644
--- a/cmd/tokidoki/main.go
+++ b/cmd/tokidoki/main.go
@@ -67,12 +67,12 @@ func (u *tokidokiHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	}
 
 	if r.URL.Path == userPrincipalPath {
-		opts := webdav.ServeUserPrincipalOptions{
-			UserPrincipalPath: userPrincipalPath,
-			HomeSets:          homeSets,
+		opts := webdav.ServePrincipalOptions{
+			CurrentUserPrincipalPath: userPrincipalPath,
+			HomeSets:                 homeSets,
 		}
 
-		webdav.ServeUserPrincipal(w, r, &opts)
+		webdav.ServePrincipal(w, r, &opts)
 		return
 	}
 
diff --git a/go.mod b/go.mod
index 024c226..185fc20 100644
--- a/go.mod
+++ b/go.mod
@@ -14,4 +14,4 @@ require (
 require golang.org/x/text v0.3.7 // indirect
 
 // This needs to be removed once everything is merged upstream
-replace github.com/emersion/go-webdav v0.3.2-0.20220310154811-85d2b222bbcd => github.com/bitfehler/go-webdav v0.3.2-0.20220505121709-bb7224b67200
+replace github.com/emersion/go-webdav v0.3.2-0.20220310154811-85d2b222bbcd => github.com/bitfehler/go-webdav v0.3.2-0.20220513133554-bf9c9fcc431a
diff --git a/go.sum b/go.sum
index c9c079c..ef1e466 100644
--- a/go.sum
+++ b/go.sum
@@ -1,5 +1,5 @@
-github.com/bitfehler/go-webdav v0.3.2-0.20220505121709-bb7224b67200 h1:A0Pp7tuJDHbsfHbjrc+lDtOI976K2us7WEhvlEy1BnY=
-github.com/bitfehler/go-webdav v0.3.2-0.20220505121709-bb7224b67200/go.mod h1:uSM1VveeKtogBVWaYccTksToczooJ0rrVGNsgnDsr4Q=
+github.com/bitfehler/go-webdav v0.3.2-0.20220513133554-bf9c9fcc431a h1:XYSxbKDn3WoYt1M3fT4RXMtzOieaNxvNs9qBxcOw6Vg=
+github.com/bitfehler/go-webdav v0.3.2-0.20220513133554-bf9c9fcc431a/go.mod h1:uSM1VveeKtogBVWaYccTksToczooJ0rrVGNsgnDsr4Q=
 github.com/emersion/go-ical v0.0.0-20200224201310-cd514449c39e h1:YGM1sI7edZOt8KAfX9Miq/X99d2QXdgjkJ7vN4HjxAA=
 github.com/emersion/go-ical v0.0.0-20200224201310-cd514449c39e/go.mod h1:4xVTBPcT43a1pp3vdaa+FuRdX5XhKCZPpWv7m0z9ByM=
 github.com/emersion/go-imap v1.2.0 h1:lyUQ3+EVM21/qbWE/4Ya5UG9r5+usDxlg4yfp3TgHFA=