diff --git a/src/lib/kaboutdata.h b/src/lib/kaboutdata.h
--- a/src/lib/kaboutdata.h
+++ b/src/lib/kaboutdata.h
@@ -289,7 +289,7 @@
 
 /**
  * This class is used to store information about a program or plugin.
- * It can store such values as version number, program name, home page, email address
+ * It can store such values as version number, program name, home page, address
  * for bug reporting, multiple authors and contributors
  * (using KAboutPerson), license and copyright information.
  *
@@ -408,7 +408,7 @@
      * setOrganizationDomain() if you want to control this value yourself.
      * @see setOrganizationDomain
      *
-     * @param bugsEmailAddress The bug report email address string.
+     * @param bugAddress The bug report address string, an email address or a URL.
      *        This defaults to the kde.org bug system.
      */
     // KF6: remove constructor that includes catalogName, and put default
@@ -421,7 +421,7 @@
                const QString &copyrightStatement = QString(),
                const QString &otherText = QString(),
                const QString &homePageAddress = QString(),
-               const QString &bugsEmailAddress = QStringLiteral("submit@bugs.kde.org")
+               const QString &bugAddress = QStringLiteral("submit@bugs.kde.org")
               );
 
     /**
@@ -708,7 +708,7 @@
     /**
      * Defines the address where bug reports should be sent.
      *
-     * @param bugAddress The bug report email address string.
+     * @param bugAddress The bug report email address or URL.
      *        This defaults to the kde.org bug system.
      */
     KAboutData &setBugAddress(const QByteArray &bugAddress);
@@ -830,8 +830,8 @@
     QString homepage() const;
 
     /**
-     * Returns the email address for bugs.
-     * @return the email address where to report bugs.
+     * Returns the email address or URL for bugs.
+     * @return the address where to report bugs.
      */
     QString bugAddress() const;
 
diff --git a/src/lib/kaboutdata.cpp b/src/lib/kaboutdata.cpp
--- a/src/lib/kaboutdata.cpp
+++ b/src/lib/kaboutdata.cpp
@@ -411,7 +411,7 @@
     // can just give it a pointer, w/o any allocations.
     QByteArray _internalProgramName;
     QByteArray _version;
-    QByteArray _bugEmailAddress;
+    QByteArray _bugAddress;
 
     static QList<KAboutPerson> parseTranslators(const QString &translatorName, const QString &translatorEmail);
 
@@ -425,7 +425,7 @@
                        const QString &_copyrightStatement,
                        const QString &text,
                        const QString &homePageAddress,
-                       const QString &bugsEmailAddress
+                       const QString &bugAddress
                       )
     : d(new Private)
 {
@@ -445,7 +445,7 @@
     d->_copyrightStatement = _copyrightStatement;
     d->_otherText = text;
     d->_homepageAddress = homePageAddress;
-    d->_bugEmailAddress = bugsEmailAddress.toUtf8();
+    d->_bugAddress = bugAddress.toUtf8();
 
     QUrl homePageUrl(homePageAddress);
     if (!homePageUrl.isValid() || homePageUrl.scheme().isEmpty()) {
@@ -490,7 +490,7 @@
 
     // match behaviour of other constructors
     d->_licenseList.append(KAboutLicense(KAboutLicense::Unknown, this));
-    d->_bugEmailAddress = "submit@bugs.kde.org";
+    d->_bugAddress = "submit@bugs.kde.org";
     d->organizationDomain = QStringLiteral("kde.org");
     d->desktopFileName = QStringLiteral("org.kde.%1").arg(d->_componentName);
 }
@@ -677,7 +677,7 @@
 
 KAboutData &KAboutData::setBugAddress(const QByteArray &_bugAddress)
 {
-    d->_bugEmailAddress = _bugAddress;
+    d->_bugAddress = _bugAddress;
     return *this;
 }
 
@@ -774,7 +774,7 @@
 
 QString KAboutData::bugAddress() const
 {
-    return QString::fromUtf8(d->_bugEmailAddress.constData());
+    return QString::fromUtf8(d->_bugAddress.constData());
 }
 
 QString KAboutData::organizationDomain() const
@@ -787,10 +787,10 @@
 /// for the bug mail address. Used in particular for KCrash.
 const char *KAboutData::internalBugAddress() const
 {
-    if (d->_bugEmailAddress.isEmpty()) {
+    if (d->_bugAddress.isEmpty()) {
         return 0;
     }
-    return d->_bugEmailAddress.constData();
+    return d->_bugAddress.constData();
 }
 
 QList<KAboutPerson> KAboutData::authors() const