diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,7 +35,7 @@
 set(KMAILTRANSPORT_LIB_VERSION "5.11.40")
 set(KLDAP_LIB_VERSION "5.11.40")
 set(CALENDARUTILS_LIB_VERSION "5.11.40")
-set(KCALENDARCORE_LIB_VERSION "5.11.40")
+set(KCALENDARCORE_LIB_VERSION "5.11.42")
 set(CALENDARSUPPORT_LIB_VERSION "5.11.40")
 set(LIBKDEPIM_LIB_VERSION "5.11.40")
 set(EVENTVIEW_LIB_VERSION "5.11.40")
diff --git a/src/alarmdialog.cpp b/src/alarmdialog.cpp
--- a/src/alarmdialog.cpp
+++ b/src/alarmdialog.cpp
@@ -146,7 +146,7 @@
         const KCalCore::Person::List::ConstIterator end(addresses.constEnd());
         for (KCalCore::Person::List::ConstIterator it = addresses.constBegin();
              it != end; ++it) {
-            add << (*it)->fullName();
+            add << (*it).fullName();
         }
         mUi->mEmailAddress->setText(add.join(QStringLiteral(", ")));
         mUi->mEmailText->setPlainText(alarm->mailText());
diff --git a/src/incidenceattendee.cpp b/src/incidenceattendee.cpp
--- a/src/incidenceattendee.cpp
+++ b/src/incidenceattendee.cpp
@@ -194,16 +194,16 @@
 {
     mLoadedIncidence = incidence;
 
-    if (iAmOrganizer() || incidence->organizer()->isEmpty()) {
+    if (iAmOrganizer() || incidence->organizer().isEmpty()) {
         mUi->mOrganizerStack->setCurrentIndex(0);
 
         int found = -1;
-        const QString fullOrganizer = incidence->organizer()->fullName();
-        const QString organizerEmail = incidence->organizer()->email();
+        const QString fullOrganizer = incidence->organizer().fullName();
+        const QString organizerEmail = incidence->organizer().email();
         for (int i = 0; i < mUi->mOrganizerCombo->count(); ++i) {
-            KCalCore::Person::Ptr organizerCandidate
+            KCalCore::Person organizerCandidate
                 = KCalCore::Person::fromFullName(mUi->mOrganizerCombo->itemText(i));
-            if (organizerCandidate->email() == organizerEmail) {
+            if (organizerCandidate.email() == organizerEmail) {
                 found = i;
                 mUi->mOrganizerCombo->setCurrentIndex(i);
                 break;
@@ -217,7 +217,7 @@
         mUi->mOrganizerLabel->setVisible(false);
     } else { // someone else is the organizer
         mUi->mOrganizerStack->setCurrentIndex(1);
-        mUi->mOrganizerLabel->setText(incidence->organizer()->fullName());
+        mUi->mOrganizerLabel->setText(incidence->organizer().fullName());
         mUi->mOrganizerLabel->setVisible(true);
     }
 
@@ -282,12 +282,12 @@
         KCalCore::Event tmp;
         tmp.setOrganizer(mUi->mOrganizerCombo->currentText());
 
-        if (mLoadedIncidence->organizer()->email() != tmp.organizer()->email()) {
+        if (mLoadedIncidence->organizer().email() != tmp.organizer().email()) {
             qCDebug(INCIDENCEEDITOR_LOG) << "Organizer changed. Old was "
-                                         << mLoadedIncidence->organizer()->name()
-                                         << mLoadedIncidence->organizer()->email() << "; new is "
-                                         << tmp.organizer()->name()
-                                         << tmp.organizer()->email();
+                                         << mLoadedIncidence->organizer().name()
+                                         << mLoadedIncidence->organizer().email() << "; new is "
+                                         << tmp.organizer().name()
+                                         << tmp.organizer().email();
             return true;
         }
     }
@@ -783,7 +783,7 @@
 {
     if (mLoadedIncidence) {
         const IncidenceEditorNG::EditorConfig *config = IncidenceEditorNG::EditorConfig::instance();
-        return config->thatIsMe(mLoadedIncidence->organizer()->email());
+        return config->thatIsMe(mLoadedIncidence->organizer().email());
     }
 
     return true;
@@ -987,12 +987,12 @@
 void IncidenceAttendee::printDebugInfo() const
 {
     qCDebug(INCIDENCEEDITOR_LOG) << "I'm organizer   : " << iAmOrganizer();
-    qCDebug(INCIDENCEEDITOR_LOG) << "Loaded organizer: " << mLoadedIncidence->organizer()->email();
+    qCDebug(INCIDENCEEDITOR_LOG) << "Loaded organizer: " << mLoadedIncidence->organizer().email();
 
     if (iAmOrganizer()) {
         KCalCore::Event tmp;
         tmp.setOrganizer(mUi->mOrganizerCombo->currentText());
-        qCDebug(INCIDENCEEDITOR_LOG) << "Organizer combo: " << tmp.organizer()->email();
+        qCDebug(INCIDENCEEDITOR_LOG) << "Organizer combo: " << tmp.organizer().email();
     }
 
     const KCalCore::Attendee::List originalList = mLoadedIncidence->attendees();
diff --git a/src/incidencedefaults.cpp b/src/incidencedefaults.cpp
--- a/src/incidencedefaults.cpp
+++ b/src/incidencedefaults.cpp
@@ -66,22 +66,22 @@
     bool mCleanupTemporaryFiles;
 
     /// Methods
-    KCalCore::Person::Ptr organizerAsPerson() const;
-    KCalCore::Attendee::Ptr organizerAsAttendee(const KCalCore::Person::Ptr &organizer) const;
+    KCalCore::Person organizerAsPerson() const;
+    KCalCore::Attendee::Ptr organizerAsAttendee(const KCalCore::Person &organizer) const;
 
     void todoDefaults(const KCalCore::Todo::Ptr &todo) const;
     void eventDefaults(const KCalCore::Event::Ptr &event) const;
     void journalDefaults(const KCalCore::Journal::Ptr &journal) const;
 };
 }
 
-KCalCore::Person::Ptr IncidenceDefaultsPrivate::organizerAsPerson() const
+KCalCore::Person IncidenceDefaultsPrivate::organizerAsPerson() const
 {
     const QString invalidEmail = IncidenceDefaults::invalidEmailAddress();
 
-    KCalCore::Person::Ptr organizer(new KCalCore::Person);
-    organizer->setName(i18nc("@label", "no (valid) identities found"));
-    organizer->setEmail(invalidEmail);
+    KCalCore::Person organizer;
+    organizer.setName(i18nc("@label", "no (valid) identities found"));
+    organizer.setEmail(invalidEmail);
 
     if (mEmails.isEmpty()) {
         // Don't bother any longer, either someone forget to call setFullEmails, or
@@ -97,23 +97,23 @@
             QString email;
             const bool success = KEmailAddress::extractEmailAddressAndName(fullEmail, email, name);
             if (success && email.endsWith(mGroupWareDomain)) {
-                organizer->setName(name);
-                organizer->setEmail(email);
+                organizer.setName(name);
+                organizer.setEmail(email);
                 break;
             }
         }
     }
 
-    if (organizer->email() == invalidEmail) {
+    if (organizer.email() == invalidEmail) {
         // Either, no groupware was used, or we didn't find a groupware email address.
         // Now try to
         for (const QString &fullEmail : qAsConst(mEmails)) {
             QString name;
             QString email;
             const bool success = KEmailAddress::extractEmailAddressAndName(fullEmail, email, name);
             if (success) {
-                organizer->setName(name);
-                organizer->setEmail(email);
+                organizer.setName(name);
+                organizer.setEmail(email);
                 break;
             }
         }
@@ -123,14 +123,14 @@
 }
 
 KCalCore::Attendee::Ptr IncidenceDefaultsPrivate::organizerAsAttendee(
-    const KCalCore::Person::Ptr &organizer) const
+    const KCalCore::Person &organizer) const
 {
     KCalCore::Attendee::Ptr organizerAsAttendee(new KCalCore::Attendee(QLatin1String(
                                                                            ""), QLatin1String("")));
     // Really, the appropriate values (even the fall back values) should come from
     // organizer. (See organizerAsPerson for more details).
-    organizerAsAttendee->setName(organizer->name());
-    organizerAsAttendee->setEmail(organizer->email());
+    organizerAsAttendee->setName(organizer.name());
+    organizerAsAttendee->setEmail(organizer.email());
     // NOTE: Don't set the status to None, this value is not supported by the attendee
     //       editor atm.
     organizerAsAttendee->setStatus(KCalCore::Attendee::Accepted);
@@ -376,7 +376,7 @@
     incidence->clearRecurrence();
     incidence->clearTempFiles();
 
-    const KCalCore::Person::Ptr organizerAsPerson = d->organizerAsPerson();
+    const KCalCore::Person organizerAsPerson = d->organizerAsPerson();
 #ifdef KDEPIM_ENTERPRISE_BUILD
     incidence->addAttendee(d->organizerAsAttendee(organizerAsPerson));
 #endif
diff --git a/src/individualmailcomponentfactory.cpp b/src/individualmailcomponentfactory.cpp
--- a/src/individualmailcomponentfactory.cpp
+++ b/src/individualmailcomponentfactory.cpp
@@ -201,8 +201,8 @@
         openDialog(question, mIncidence->attendees(), action, buttonYes, buttonNo);
     } else {
         KCalCore::Attendee::Ptr organizer(new KCalCore::Attendee(
-                                              mIncidence->organizer()->name(),
-                                              mIncidence->organizer()->email()));
+                                              mIncidence->organizer().name(),
+                                              mIncidence->organizer().email()));
         openDialog(question, KCalCore::Attendee::List() << organizer, action, buttonYes, buttonNo);
     }
 }
@@ -215,8 +215,8 @@
         openDialog(question, mIncidence->attendees(), action, buttonYes, buttonNo);
     } else {
         KCalCore::Attendee::Ptr organizer(new KCalCore::Attendee(
-                                              mIncidence->organizer()->name(),
-                                              mIncidence->organizer()->email()));
+                                              mIncidence->organizer().name(),
+                                              mIncidence->organizer().email()));
         openDialog(question, KCalCore::Attendee::List() << organizer, action, buttonYes, buttonNo);
     }
 }
@@ -227,8 +227,8 @@
         openDialog(question, mIncidence->attendees(), action, buttonYes, buttonNo);
     } else {
         KCalCore::Attendee::Ptr organizer(new KCalCore::Attendee(
-                                              mIncidence->organizer()->name(),
-                                              mIncidence->organizer()->email()));
+                                              mIncidence->organizer().name(),
+                                              mIncidence->organizer().email()));
         openDialog(question, KCalCore::Attendee::List() << organizer, action, buttonYes, buttonNo);
     }
 }