diff --git a/plugins/audiocdencoder.cpp b/plugins/audiocdencoder.cpp
index 23e30a7..f59fc72 100644
--- a/plugins/audiocdencoder.cpp
+++ b/plugins/audiocdencoder.cpp
@@ -1,79 +1,78 @@
 /*
   Copyright (C) 2004, 2005 Benjamin Meyer <ben at meyerhome dot net>
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation; either version 2 of the License, or
   (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
   GNU General Public License for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 
 #include "audiocdencoder.h"
-#include <klibloader.h>
-#include <QDebug>
 #include "audiocd_kio_debug.h"
+#include <QDebug>
+#include <QLibrary>
+#include <QLibraryInfo>
 #include <QDir>
 #include <QRegExp>
-#include <QLibraryInfo>
 
 Q_LOGGING_CATEGORY(AUDIOCD_KIO_LOG, "log_audiocd_kio")
 
 /**
  * Attempt to load a plugin and see if it has the symbol create_audiocd_encoders.
  * @param libFileName file to try to load.
  * @returns pointer to the symbol or NULL
  */
-KLibrary::void_function_ptr loadPlugin(const QString &libFileName)
+QFunctionPointer loadPlugin(const QString &libFileName)
 {
     qCDebug(AUDIOCD_KIO_LOG) << "Trying to load library. File: \"" << libFileName.toLatin1() << "\".";
-    KLibrary::void_function_ptr cplugin = KLibrary::void_function_ptr(
-            KLibrary( libFileName ).resolveFunction( "create_audiocd_encoders" ));
+    QFunctionPointer cplugin = QLibrary(QLibraryInfo::location(QLibraryInfo::PluginsPath) + QDir::separator() + libFileName).resolve( "create_audiocd_encoders" );
     if (!cplugin)
         return NULL;
     qCDebug(AUDIOCD_KIO_LOG) << "We have a plugin. File:  \"" << libFileName << "\".";
     return cplugin;
 }
 
 /**
  * There might be a "better" way of doing this, but I don't know it,
  * but I do know that this does work. :)  Feel free to improve the loading system,
  * there isn't much code anyway.
  */
 void AudioCDEncoder::findAllPlugins(KIO::SlaveBase *slave, QList<AudioCDEncoder *>&encoders)
 {
     QString foundEncoders;
     QDir dir=QLibraryInfo::location(QLibraryInfo::PluginsPath);
     if (!dir.exists()) {
         qCDebug(AUDIOCD_KIO_LOG) << "Directory given by QLibraryInfo: " << dir.path() << " doesn't exists!";
     }
     dir.setFilter(QDir::Files | QDir::Hidden);
     const QFileInfoList files = dir.entryInfoList();
     for (int i = 0; i < files.count(); ++i) {
         QFileInfo fi(files.at(i));
         if (0 < fi.fileName().count(QRegExp( QLatin1String( "^libaudiocd_encoder_.*.so$" )))) {
             QString fileName = (fi.fileName().mid(0, fi.fileName().indexOf(QLatin1Char( '.' ))));
             
             if (foundEncoders.contains(fileName)) {
                 qCDebug(AUDIOCD_KIO_LOG) << "Warning, encoder has been found twice!";
                 continue;
             }
             foundEncoders.append(fileName);
-            KLibrary::void_function_ptr function = loadPlugin(fileName);
+            QFunctionPointer function = loadPlugin(fileName);
             if (function) {
                 void (*functionPointer) (KIO::SlaveBase *, QList<AudioCDEncoder*>&) =
                 (void (*)(KIO::SlaveBase *slave, QList<AudioCDEncoder *>&encoders)) function;
                 functionPointer(slave, encoders);
                 
             }
         }
     }
 }