diff --git a/linuxdeployqt/main.cpp b/linuxdeployqt/main.cpp
index 37a46c7..60a2458 100644
--- a/linuxdeployqt/main.cpp
+++ b/linuxdeployqt/main.cpp
@@ -48,7 +48,6 @@ int main(int argc, char **argv)
         qDebug() << "   -no-plugins        : Skip plugin deployment";
         qDebug() << "   -appimage          : Create an AppImage";
         qDebug() << "   -no-strip          : Don't run 'strip' on the binaries";
-        qDebug() << "   -use-debug-libs    : Deploy with debug versions of libraries and plugins (implies -no-strip)";
         qDebug() << "   -executable=<path> : Let the given executable use the deployed libraries too";
         qDebug() << "   -qmldir=<path>     : Scan for QML imports in the given path";
         qDebug() << "   -always-overwrite  : Copy files even if the target file exists";
@@ -97,7 +96,6 @@ int main(int argc, char **argv)
 
     bool plugins = true;
     bool dmg = false;
-    bool useDebugLibs = false;
     extern bool runStripEnabled;
     extern bool alwaysOwerwriteEnabled;
     extern QStringList librarySearchPath;
@@ -116,10 +114,6 @@ int main(int argc, char **argv)
         } else if (argument == QByteArray("-no-strip")) {
             LogDebug() << "Argument found:" << argument;
             runStripEnabled = false;
-        } else if (argument == QByteArray("-use-debug-libs")) {
-            LogDebug() << "Argument found:" << argument;
-            useDebugLibs = true;
-            runStripEnabled = false;
         } else if (argument.startsWith(QByteArray("-verbose"))) {
             LogDebug() << "Argument found:" << argument;
             int index = argument.indexOf("=");
@@ -160,7 +154,7 @@ int main(int argc, char **argv)
         }
      }
 
-    DeploymentInfo deploymentInfo = deployQtLibraries(appDirPath, additionalExecutables, useDebugLibs);
+    DeploymentInfo deploymentInfo = deployQtLibraries(appDirPath, additionalExecutables);
 
     // Convenience: Look for .qml files in the current directoty if no -qmldir specified.
     if (qmlDirs.isEmpty()) {
@@ -184,7 +178,7 @@ int main(int argc, char **argv)
 
     if (plugins && !deploymentInfo.qtPath.isEmpty()) {
         deploymentInfo.pluginPath = QDir::cleanPath(deploymentInfo.qtPath + "/../plugins");
-        deployPlugins(appDirPath, deploymentInfo, useDebugLibs);
+        deployPlugins(appDirPath, deploymentInfo);
         createQtConf(appDirPath);
     }
 
diff --git a/shared/shared.cpp b/shared/shared.cpp
index dc4005a..382c1e4 100644
--- a/shared/shared.cpp
+++ b/shared/shared.cpp
@@ -209,7 +209,7 @@ LddInfo findDependencyInfo(const QString &binaryPath)
     return info;
 }
 
-LibraryInfo parseLddLibraryLine(const QString &line, const QString &appDirPath, const QSet<QString> &rpaths, bool useDebugLibs)
+LibraryInfo parseLddLibraryLine(const QString &line, const QString &appDirPath, const QSet<QString> &rpaths)
 {
     LibraryInfo info;
     QString trimmed = line.trimmed();
@@ -230,7 +230,7 @@ LibraryInfo parseLddLibraryLine(const QString &line, const QString &appDirPath,
     int part = 0;
     QString name;
     QString qtPath;
-    QString suffix = useDebugLibs ? "_debug" : "";
+    QString suffix = "";
 
     // Split the line into [Qt-path]/lib/qt[Module].library/Versions/[Version]/
     QStringList parts = trimmed.split("/");
@@ -326,8 +326,8 @@ QStringList findAppLibraries(const QString &appDirPath)
         iter.next();
         result << iter.fileInfo().filePath();
     }
-    // .so.*
-    QDirIterator iter2(appDirPath, QStringList() << QString::fromLatin1("*.so.*"),
+    // .so.*, FIXME: Is the above really needed or is it covered by the below too?
+    QDirIterator iter2(appDirPath, QStringList() << QString::fromLatin1("*.so*"),
             QDir::Files, QDirIterator::Subdirectories);
 
     while (iter2.hasNext()) {
@@ -354,11 +354,11 @@ QStringList findAppBundleFiles(const QString &appDirPath, bool absolutePath = fa
     return result;
 }
 
-QList<LibraryInfo> getQtLibraries(const QList<DylibInfo> &dependencies, const QString &appDirPath, const QSet<QString> &rpaths, bool useDebugLibs)
+QList<LibraryInfo> getQtLibraries(const QList<DylibInfo> &dependencies, const QString &appDirPath, const QSet<QString> &rpaths)
 {
     QList<LibraryInfo> libraries;
     for (const DylibInfo &dylibInfo : dependencies) {
-        LibraryInfo info = parseLddLibraryLine(dylibInfo.binaryPath, appDirPath, rpaths, useDebugLibs);
+        LibraryInfo info = parseLddLibraryLine(dylibInfo.binaryPath, appDirPath, rpaths);
         if (info.libraryName.isEmpty() == false) {
             LogDebug() << "Adding library:";
             LogDebug() << info;
@@ -405,19 +405,19 @@ QSet<QString> getBinaryRPaths(const QString &path, bool resolve = true, QString
     return rpaths;
 }
 
-QList<LibraryInfo> getQtLibraries(const QString &path, const QString &appDirPath, const QSet<QString> &rpaths, bool useDebugLibs)
+QList<LibraryInfo> getQtLibraries(const QString &path, const QString &appDirPath, const QSet<QString> &rpaths)
 {
     const LddInfo info = findDependencyInfo(path);
-    return getQtLibraries(info.dependencies, appDirPath, rpaths + getBinaryRPaths(path), useDebugLibs);
+    return getQtLibraries(info.dependencies, appDirPath, rpaths + getBinaryRPaths(path));
 }
 
-QList<LibraryInfo> getQtLibrariesForPaths(const QStringList &paths, const QString &appDirPath, const QSet<QString> &rpaths, bool useDebugLibs)
+QList<LibraryInfo> getQtLibrariesForPaths(const QStringList &paths, const QString &appDirPath, const QSet<QString> &rpaths)
 {
     QList<LibraryInfo> result;
     QSet<QString> existing;
 
     foreach (const QString &path, paths) {
-        foreach (const LibraryInfo &info, getQtLibraries(path, appDirPath, rpaths, useDebugLibs)) {
+        foreach (const LibraryInfo &info, getQtLibraries(path, appDirPath, rpaths)) {
             if (!existing.contains(info.libraryPath)) { // avoid duplicates
                 existing.insert(info.libraryPath);
                 result << info;
@@ -609,7 +609,7 @@ void stripAppBinary(const QString &bundlePath)
     a list of actually deployed libraries.
 */
 DeploymentInfo deployQtLibraries(QList<LibraryInfo> libraries,
-        const QString &bundlePath, const QStringList &binaryPaths, bool useDebugLibs,
+        const QString &bundlePath, const QStringList &binaryPaths,
                                   bool useLoaderPath)
 {
 
@@ -651,7 +651,7 @@ DeploymentInfo deployQtLibraries(QList<LibraryInfo> libraries,
         }
 
         // Check for library dependencies
-        QList<LibraryInfo> dependencies = getQtLibraries(deployedBinaryPath, bundlePath, rpathsUsed, useDebugLibs);
+        QList<LibraryInfo> dependencies = getQtLibraries(deployedBinaryPath, bundlePath, rpathsUsed);
 
         foreach (LibraryInfo dependency, dependencies) {
             if (dependency.rpathUsed.isEmpty() != true) {
@@ -671,7 +671,7 @@ DeploymentInfo deployQtLibraries(QList<LibraryInfo> libraries,
     return deploymentInfo;
 }
 
-DeploymentInfo deployQtLibraries(const QString &appDirPath, const QStringList &additionalExecutables, bool useDebugLibs)
+DeploymentInfo deployQtLibraries(const QString &appDirPath, const QStringList &additionalExecutables)
 {
    AppDirInfo applicationBundle;
    applicationBundle.path = appDirPath;
@@ -693,7 +693,7 @@ DeploymentInfo deployQtLibraries(const QString &appDirPath, const QStringList &a
 
    LogDebug() << "allLibraryPaths:" << allLibraryPaths;
 
-   QList<LibraryInfo> libraries = getQtLibrariesForPaths(allBinaryPaths, appDirPath, allLibraryPaths, useDebugLibs);
+   QList<LibraryInfo> libraries = getQtLibrariesForPaths(allBinaryPaths, appDirPath, allLibraryPaths);
    if (libraries.isEmpty() && !alwaysOwerwriteEnabled) {
 
         LogWarning() << "Could not find any external Qt libraries to deploy in" << appDirPath;
@@ -701,12 +701,12 @@ DeploymentInfo deployQtLibraries(const QString &appDirPath, const QStringList &a
         LogWarning() << "If so, you will need to rebuild" << appDirPath << "before trying again.";
         return DeploymentInfo();
    } else {
-       return deployQtLibraries(libraries, applicationBundle.path, allBinaryPaths, useDebugLibs, !additionalExecutables.isEmpty());
+       return deployQtLibraries(libraries, applicationBundle.path, allBinaryPaths, !additionalExecutables.isEmpty());
    }
 }
 
 void deployPlugins(const AppDirInfo &appDirInfo, const QString &pluginSourcePath,
-        const QString pluginDestinationPath, DeploymentInfo deploymentInfo, bool useDebugLibs)
+        const QString pluginDestinationPath, DeploymentInfo deploymentInfo)
 {
     LogNormal() << "Deploying plugins from" << pluginSourcePath;
 
@@ -770,8 +770,8 @@ void deployPlugins(const AppDirInfo &appDirInfo, const QString &pluginSourcePath
 
         if (copyFilePrintStatus(sourcePath, destinationPath)) {
             runStrip(destinationPath);
-            QList<LibraryInfo> libraries = getQtLibraries(destinationPath, appDirInfo.path, deploymentInfo.rpathsUsed, useDebugLibs);
-            deployQtLibraries(libraries, appDirInfo.path, QStringList() << destinationPath, useDebugLibs, deploymentInfo.useLoaderPath);
+            QList<LibraryInfo> libraries = getQtLibraries(destinationPath, appDirInfo.path, deploymentInfo.rpathsUsed);
+            deployQtLibraries(libraries, appDirInfo.path, QStringList() << destinationPath, deploymentInfo.useLoaderPath);
         }
     }
 }
@@ -807,14 +807,14 @@ void createQtConf(const QString &appDirPath)
     }
 }
 
-void deployPlugins(const QString &appDirPath, DeploymentInfo deploymentInfo, bool useDebugLibs)
+void deployPlugins(const QString &appDirPath, DeploymentInfo deploymentInfo)
 {
     AppDirInfo applicationBundle;
     applicationBundle.path = appDirPath;
     applicationBundle.binaryPath = findAppBinary(appDirPath);
 
     const QString pluginDestinationPath = appDirPath + "/" + "plugins";
-    deployPlugins(applicationBundle, deploymentInfo.pluginPath, pluginDestinationPath, deploymentInfo, useDebugLibs);
+    deployPlugins(applicationBundle, deploymentInfo.pluginPath, pluginDestinationPath, deploymentInfo);
 }
 
 void deployQmlImport(const QString &appDirPath, const QSet<QString> &rpaths, const QString &importSourcePath, const QString &importName)
@@ -965,11 +965,11 @@ void changeQtLibraries(const QList<LibraryInfo> libraries, const QStringList &bi
     }
 }
 
-void changeQtLibraries(const QString appPath, const QString &qtPath, bool useDebugLibs)
+void changeQtLibraries(const QString appPath, const QString &qtPath)
 {
     const QString appBinaryPath = findAppBinary(appPath);
     const QStringList libraryPaths = findAppLibraries(appPath);
-    const QList<LibraryInfo> libraries = getQtLibrariesForPaths(QStringList() << appBinaryPath << libraryPaths, appPath, getBinaryRPaths(appBinaryPath, true), useDebugLibs);
+    const QList<LibraryInfo> libraries = getQtLibrariesForPaths(QStringList() << appBinaryPath << libraryPaths, appPath, getBinaryRPaths(appBinaryPath, true));
     if (libraries.isEmpty()) {
 
         LogWarning() << "Could not find any _external_ Qt libraries to change in" << appPath;
diff --git a/shared/shared.h b/shared/shared.h
index 507cef5..641b212 100644
--- a/shared/shared.h
+++ b/shared/shared.h
@@ -104,19 +104,19 @@ public:
 
 inline QDebug operator<<(QDebug debug, const AppDirInfo &info);
 
-void changeQtLibraries(const QString appPath, const QString &qtPath, bool useDebugLibs);
+void changeQtLibraries(const QString appPath, const QString &qtPath);
 void changeQtLibraries(const QList<LibraryInfo> libraries, const QStringList &binaryPaths, const QString &qtPath);
 
 LddInfo findDependencyInfo(const QString &binaryPath);
-LibraryInfo parseLddLibraryLine(const QString &line, const QString &appDirPath, const QSet<QString> &rpaths, bool useDebugLibs);
+LibraryInfo parseLddLibraryLine(const QString &line, const QString &appDirPath, const QSet<QString> &rpaths);
 QString findAppBinary(const QString &appDirPath);
-QList<LibraryInfo> getQtLibraries(const QString &path, const QString &appDirPath, const QSet<QString> &rpaths, bool useDebugLibs);
-QList<LibraryInfo> getQtLibraries(const QStringList &lddLines, const QString &appDirPath, const QSet<QString> &rpaths, bool useDebugLibs);
+QList<LibraryInfo> getQtLibraries(const QString &path, const QString &appDirPath, const QSet<QString> &rpaths);
+QList<LibraryInfo> getQtLibraries(const QStringList &lddLines, const QString &appDirPath, const QSet<QString> &rpaths);
 QString copyLibrary(const LibraryInfo &library, const QString path);
-DeploymentInfo deployQtLibraries(const QString &appDirPath, const QStringList &additionalExecutables, bool useDebugLibs);
-DeploymentInfo deployQtLibraries(QList<LibraryInfo> libraries,const QString &bundlePath, const QStringList &binaryPaths, bool useDebugLibs, bool useLoaderPath);
+DeploymentInfo deployQtLibraries(const QString &appDirPath, const QStringList &additionalExecutables);
+DeploymentInfo deployQtLibraries(QList<LibraryInfo> libraries,const QString &bundlePath, const QStringList &binaryPaths, bool useLoaderPath);
 void createQtConf(const QString &appDirPath);
-void deployPlugins(const QString &appDirPath, DeploymentInfo deploymentInfo, bool useDebugLibs);
+void deployPlugins(const QString &appDirPath, DeploymentInfo deploymentInfo);
 bool deployQmlImports(const QString &appDirPath, DeploymentInfo deploymentInfo, QStringList &qmlDirs);
 void changeIdentification(const QString &id, const QString &binaryPath);
 void changeInstallName(const QString &oldName, const QString &newName, const QString &binaryPath);