diff --git a/src/main.cpp b/src/main.cpp
index 9f9f575..e904371 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -44,35 +44,37 @@ int Q_DECL_IMPORT main(int argc, char* argv[])
     migrate.migrate();
 
     KLocalizedString::setApplicationDomain("partitionmanager");
-    KAboutData* aboutData = new KAboutData(
+    KAboutData aboutData (
         QStringLiteral("partitionmanager"),
         xi18nc("@title", "<application>KDE Partition Manager</application>"),
         QStringLiteral(VERSION),
-        i18nc("@title", "Manage your disks, partitions and file systems"),
+        i18nc("@description", "Manage your disks, partitions and file systems"),
         KAboutLicense::GPL_V3,
         i18nc("@info:credit", "© 2008-2013 Volker Lanz\n© 2012-2016 Andrius Štikonas"));
-    aboutData->setOrganizationDomain(QByteArray("kde.org"));
-    aboutData->setProductName(QByteArray("partitionmanager"));
+    aboutData.setOrganizationDomain(QByteArray("kde.org"));
+    aboutData.setProductName(QByteArray("partitionmanager"));
 
-    aboutData->addAuthor(i18nc("@info:credit", "Volker Lanz"), i18nc("@info:credit", "Former maintainer"));
-    aboutData->addAuthor(i18nc("@info:credit", "Andrius Štikonas"), i18nc("@info:credit", "Maintainer"), QStringLiteral("andrius@stikonas.eu"));
-    aboutData->addAuthor(i18n("Teo Mrnjavac"), i18nc("@info:credit", "Calamares maintainer"), QStringLiteral("teo@kde.org"));
-    aboutData->setHomepage(QStringLiteral("https://www.kde.org/applications/system/kdepartitionmanager"));
+    aboutData.addAuthor(i18nc("@info:credit", "Volker Lanz"), i18nc("@info:credit", "Former maintainer"));
+    aboutData.addAuthor(i18nc("@info:credit", "Andrius Štikonas"), i18nc("@info:credit", "Maintainer"), QStringLiteral("andrius@stikonas.eu"));
+    aboutData.addAuthor(i18n("Teo Mrnjavac"), i18nc("@info:credit", "Calamares maintainer"), QStringLiteral("teo@kde.org"));
+    aboutData.setHomepage(QStringLiteral("https://www.kde.org/applications/system/kdepartitionmanager"));
 
-    aboutData->addCredit(i18n("Hugo Pereira Da Costa"), i18nc("@info:credit", "Partition Widget Design"), QStringLiteral("hugo@oxygen-icons.org"));
-    KAboutData::setApplicationData(*aboutData);
+    aboutData.addCredit(i18n("Hugo Pereira Da Costa"), i18nc("@info:credit", "Partition Widget Design"), QStringLiteral("hugo@oxygen-icons.org"));
+    KAboutData::setApplicationData(aboutData);
     app.setAttribute(Qt::AA_UseHighDpiPixmaps, true);
     KCrash::initialize();
 
     QCommandLineParser parser;
-    parser.setApplicationDescription(aboutData->shortDescription());
+    parser.setApplicationDescription(aboutData.shortDescription());
     parser.addHelpOption();
     parser.addVersionOption();
+    aboutData.setupCommandLine(&parser);
     parser.addOption(QCommandLineOption(QLatin1Literal("dontsu"), i18nc("@info:shell", "Do not try to gain super user privileges")));
     parser.addOption(QCommandLineOption(QLatin1Literal("advconfig"), i18nc("@info:shell", "Show advanced tab in configuration dialog")));
     parser.addPositionalArgument(QStringLiteral("device"), i18nc("@info:shell", "Device(s) to manage"), QStringLiteral("[device...]"));
 
     parser.process(app);
+    aboutData.processCommandLine(&parser);
 
     registerMetaTypes();
     if (!checkPermissions())