diff --git a/projectforge-application/build.gradle.kts b/projectforge-application/build.gradle.kts
index 130ceb2ea6..e39019df4e 100644
--- a/projectforge-application/build.gradle.kts
+++ b/projectforge-application/build.gradle.kts
@@ -28,7 +28,7 @@ val kotlinCompilerDependencies = mutableListOf<String>()
 dependencies {
     implementation(project(":projectforge-wicket"))
     implementation(project(":projectforge-rest"))
-    implementation(project(":projectforge-caldav"))
+    implementation(project(":projectforge-carddav"))
     implementation(project(":projectforge-webapp"))
     implementation(project(":org.projectforge.plugins.datatransfer"))
     implementation(project(":org.projectforge.plugins.ihk"))
diff --git a/projectforge-caldav/src/main/resources/ical4j.properties b/projectforge-caldav/src/main/resources/ical4j.properties
deleted file mode 100644
index b11188d18f..0000000000
--- a/projectforge-caldav/src/main/resources/ical4j.properties
+++ /dev/null
@@ -1 +0,0 @@
-ical4j.parsing.relaxed=true
\ No newline at end of file
diff --git a/projectforge-caldav/build.gradle.kts b/projectforge-carddav/build.gradle.kts
similarity index 89%
rename from projectforge-caldav/build.gradle.kts
rename to projectforge-carddav/build.gradle.kts
index 269d94464d..bf7fed3446 100644
--- a/projectforge-caldav/build.gradle.kts
+++ b/projectforge-carddav/build.gradle.kts
@@ -11,4 +11,4 @@ dependencies {
     testImplementation(libs.org.mockito.core)
 }
 
-description = "projectforge-caldav"
+description = "projectforge-carddav"
diff --git a/projectforge-carddav/src/main/kotlin/org/projectforge/carddav/CardDavConfig.kt b/projectforge-carddav/src/main/kotlin/org/projectforge/carddav/CardDavConfig.kt
new file mode 100644
index 0000000000..aa4f0db8c7
--- /dev/null
+++ b/projectforge-carddav/src/main/kotlin/org/projectforge/carddav/CardDavConfig.kt
@@ -0,0 +1,12 @@
+package org.projectforge.carddav
+
+import org.springframework.beans.factory.annotation.Value
+import org.springframework.context.annotation.Configuration
+
+@Configuration
+open class CardDavConfig {
+
+    @Value("\${projectforge.carddav.basePath}")
+    open lateinit var basePath: String
+        protected set
+}
diff --git a/projectforge-caldav/src/main/kotlin/org/projectforge/carddav/CardDavController.kt b/projectforge-carddav/src/main/kotlin/org/projectforge/carddav/CardDavController.kt
similarity index 100%
rename from projectforge-caldav/src/main/kotlin/org/projectforge/carddav/CardDavController.kt
rename to projectforge-carddav/src/main/kotlin/org/projectforge/carddav/CardDavController.kt
diff --git a/projectforge-caldav/src/main/kotlin/org/projectforge/carddav/CardDavFilter.kt b/projectforge-carddav/src/main/kotlin/org/projectforge/carddav/CardDavFilter.kt
similarity index 100%
rename from projectforge-caldav/src/main/kotlin/org/projectforge/carddav/CardDavFilter.kt
rename to projectforge-carddav/src/main/kotlin/org/projectforge/carddav/CardDavFilter.kt
diff --git a/projectforge-caldav/src/main/kotlin/org/projectforge/carddav/CardDavInit.kt b/projectforge-carddav/src/main/kotlin/org/projectforge/carddav/CardDavInit.kt
similarity index 100%
rename from projectforge-caldav/src/main/kotlin/org/projectforge/carddav/CardDavInit.kt
rename to projectforge-carddav/src/main/kotlin/org/projectforge/carddav/CardDavInit.kt
diff --git a/projectforge-caldav/src/main/kotlin/org/projectforge/carddav/DAVMethodsInterceptor.kt b/projectforge-carddav/src/main/kotlin/org/projectforge/carddav/DAVMethodsInterceptor.kt
similarity index 100%
rename from projectforge-caldav/src/main/kotlin/org/projectforge/carddav/DAVMethodsInterceptor.kt
rename to projectforge-carddav/src/main/kotlin/org/projectforge/carddav/DAVMethodsInterceptor.kt
diff --git a/projectforge-caldav/src/main/kotlin/org/projectforge/carddav/controller/BaseDAVController.kt b/projectforge-carddav/src/main/kotlin/org/projectforge/carddav/controller/BaseDAVController.kt
similarity index 100%
rename from projectforge-caldav/src/main/kotlin/org/projectforge/carddav/controller/BaseDAVController.kt
rename to projectforge-carddav/src/main/kotlin/org/projectforge/carddav/controller/BaseDAVController.kt
diff --git a/projectforge-caldav/src/main/kotlin/org/projectforge/carddav/model/AddressBook.kt b/projectforge-carddav/src/main/kotlin/org/projectforge/carddav/model/AddressBook.kt
similarity index 100%
rename from projectforge-caldav/src/main/kotlin/org/projectforge/carddav/model/AddressBook.kt
rename to projectforge-carddav/src/main/kotlin/org/projectforge/carddav/model/AddressBook.kt
diff --git a/projectforge-caldav/src/main/kotlin/org/projectforge/carddav/model/Contact.kt b/projectforge-carddav/src/main/kotlin/org/projectforge/carddav/model/Contact.kt
similarity index 100%
rename from projectforge-caldav/src/main/kotlin/org/projectforge/carddav/model/Contact.kt
rename to projectforge-carddav/src/main/kotlin/org/projectforge/carddav/model/Contact.kt
diff --git a/projectforge-caldav/src/main/kotlin/org/projectforge/carddav/model/ContactMetaData.kt b/projectforge-carddav/src/main/kotlin/org/projectforge/carddav/model/ContactMetaData.kt
similarity index 100%
rename from projectforge-caldav/src/main/kotlin/org/projectforge/carddav/model/ContactMetaData.kt
rename to projectforge-carddav/src/main/kotlin/org/projectforge/carddav/model/ContactMetaData.kt
diff --git a/projectforge-caldav/src/main/kotlin/org/projectforge/carddav/model/User.kt b/projectforge-carddav/src/main/kotlin/org/projectforge/carddav/model/User.kt
similarity index 100%
rename from projectforge-caldav/src/main/kotlin/org/projectforge/carddav/model/User.kt
rename to projectforge-carddav/src/main/kotlin/org/projectforge/carddav/model/User.kt
diff --git a/projectforge-caldav/src/main/kotlin/org/projectforge/carddav/service/AddressDAVCache.kt b/projectforge-carddav/src/main/kotlin/org/projectforge/carddav/service/AddressDAVCache.kt
similarity index 100%
rename from projectforge-caldav/src/main/kotlin/org/projectforge/carddav/service/AddressDAVCache.kt
rename to projectforge-carddav/src/main/kotlin/org/projectforge/carddav/service/AddressDAVCache.kt
diff --git a/projectforge-caldav/src/main/kotlin/org/projectforge/carddav/service/AddressService.kt b/projectforge-carddav/src/main/kotlin/org/projectforge/carddav/service/AddressService.kt
similarity index 100%
rename from projectforge-caldav/src/main/kotlin/org/projectforge/carddav/service/AddressService.kt
rename to projectforge-carddav/src/main/kotlin/org/projectforge/carddav/service/AddressService.kt
diff --git a/projectforge-caldav/src/main/kotlin/org/projectforge/carddav/service/DavSessionCache.kt b/projectforge-carddav/src/main/kotlin/org/projectforge/carddav/service/DavSessionCache.kt
similarity index 100%
rename from projectforge-caldav/src/main/kotlin/org/projectforge/carddav/service/DavSessionCache.kt
rename to projectforge-carddav/src/main/kotlin/org/projectforge/carddav/service/DavSessionCache.kt
diff --git a/projectforge-carddav/src/main/resources/application.properties b/projectforge-carddav/src/main/resources/application.properties
new file mode 100644
index 0000000000..92d041dc91
--- /dev/null
+++ b/projectforge-carddav/src/main/resources/application.properties
@@ -0,0 +1 @@
+projectforge.carddav.basePath=/carddav
diff --git a/projectforge-caldav/src/test/kotlin/org/projectforge/carddav/config/CardDavControllerTest.kt b/projectforge-carddav/src/test/kotlin/org/projectforge/carddav/config/CardDavControllerTest.kt
similarity index 100%
rename from projectforge-caldav/src/test/kotlin/org/projectforge/carddav/config/CardDavControllerTest.kt
rename to projectforge-carddav/src/test/kotlin/org/projectforge/carddav/config/CardDavControllerTest.kt
diff --git a/projectforge-caldav/src/test/kotlin/org/projectforge/carddav/config/DAVMethodsInterceptorTest.kt b/projectforge-carddav/src/test/kotlin/org/projectforge/carddav/config/DAVMethodsInterceptorTest.kt
similarity index 100%
rename from projectforge-caldav/src/test/kotlin/org/projectforge/carddav/config/DAVMethodsInterceptorTest.kt
rename to projectforge-carddav/src/test/kotlin/org/projectforge/carddav/config/DAVMethodsInterceptorTest.kt
diff --git a/settings.gradle.kts b/settings.gradle.kts
index d180b1b063..f1fcf3a7ce 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -8,7 +8,7 @@ include(":projectforge-application")
 include(":projectforge-business")
 include(":projectforge-common")
 include(":projectforge-commons-test")
-include(":projectforge-caldav")
+include(":projectforge-carddav")
 include(":projectforge-jcr")
 include(":projectforge-model")
 include(":projectforge-rest")