diff --git a/bin/BuildSystem/BuildSystemBase.py b/bin/BuildSystem/BuildSystemBase.py
index 615c1a58f..f7844af6d 100644
--- a/bin/BuildSystem/BuildSystemBase.py
+++ b/bin/BuildSystem/BuildSystemBase.py
@@ -1,162 +1,156 @@
 #
 # copyright (c) 2009 Ralf Habacker <ralf.habacker@freenet.de>
 #
 
 """ \package BuildSystemBase"""
 import EmergeDebug
 from EmergeBase import *
 import compiler
 from graphviz import *
 import dependencies
 
 
 from EmergeOS.osutils import OsUtils
 
 
 class BuildSystemBase(EmergeBase):
     """provides a generic interface for build systems and implements all stuff for all build systems"""
     debug = True
 
     def __init__(self, typeName=""):
         """constructor"""
         EmergeBase.__init__(self)
         self.supportsNinja = False
         self.supportsCCACHE = emergeSettings.getboolean("Compile","UseCCache", False ) and compiler.isMinGW()
         self.supportsClang = emergeSettings.getboolean("Compile","UseClang", False )
         self.buildSystemType = typeName
 
 
     def _getmakeProgram(self):
         if self.supportsNinja and emergeSettings.getboolean("Compile","UseNinja", False):
             return "ninja"
         makeProgram = emergeSettings.get("Compile", "MakeProgram", "" )
         if makeProgram != "" and self.subinfo.options.make.supportsMultijob:
             EmergeDebug.debug("set custom make program: %s" % makeProgram, 1)
             return makeProgram
         elif not self.subinfo.options.make.supportsMultijob:
             if "MAKE" in os.environ:
                 del os.environ["MAKE"]
 
         if OsUtils.isWin():
             if compiler.isMSVC() or compiler.isIntel() :
                 return "nmake /NOLOGO"
             elif compiler.isMinGW():
                 return "mingw32-make"
             else:
                 EmergeDebug.die("unknown %s compiler" % self.compiler())
         elif OsUtils.isUnix():
             return "make"
     makeProgramm = property(_getmakeProgram)
 
     def compile(self):
         """convencience method - runs configure() and make()"""
         configure = getattr(self, 'configure')
         make = getattr(self, 'make')
         return configure() and make()
 
     def configureSourceDir(self):
         """returns source dir used for configure step"""
         # pylint: disable=E1101
         # this class never defines self.source, that happens only
         # in MultiSource.
         if hasattr(self,'source'):
             sourcedir = self.source.sourceDir()
         else:
             sourcedir = self.sourceDir()
 
         if self.subinfo.hasConfigurePath():
             sourcedir = os.path.join(sourcedir, self.subinfo.configurePath())
         return sourcedir
 
     def configureOptions(self, defines=""):
         """return options for configure command line"""
         if self.subinfo.options.configure.defines != None:
             defines += " %s" % self.subinfo.options.configure.defines
         
         if self.supportsCCACHE:
             defines += " %s" % self.ccacheOptions()
         if self.supportsClang:
             defines += " %s" % self.clangOptions()
         return defines
 
     def makeOptions(self, defines="", maybeVerbose=True):
         """return options for make command line"""
         if self.subinfo.options.make.ignoreErrors:
             defines += " -i"
         if self.subinfo.options.make.makeOptions:
             defines += " %s" % self.subinfo.options.make.makeOptions
         if maybeVerbose and EmergeDebug.verbose() > 1:
             if self.supportsNinja and emergeSettings.getboolean("Compile","UseNinja", False ):
                 defines += " -v "
             else:
                 defines += " VERBOSE=1 V=1"
         return defines
 
     def dumpEmergeDependencies( self ):
         """dump emerge package dependencies"""
         output = dependencies.dumpDependencies( self.package )
         outDir = self.buildDir()
         outFile = os.path.join( outDir, self.package + '-emerge.dot' )
         if not os.path.exists( os.path.dirname( outFile ) ):
             os.makedirs( os.path.dirname( outFile ) )
         with open( outFile, "w" ) as f:
             f.write( output )
 
         graphviz = GraphViz( self )
 
         if not graphviz.runDot( outFile, outFile + '.pdf', 'pdf' ):
             return False
 
         return graphviz.openOutput()
 
     def dumpDependencies(self):
         """dump package dependencies """
         return self.dumpEmergeDependencies()
 
     def configure(self):
         return True
         
     def make(self):
         return True
         
     def install(self):
 
         # create post (un)install scripts
         if OsUtils.isWin():
             scriptExt = ".cmd"
         elif OsUtils.isUnix():
             scriptExt = ".sh"
         for pkgtype in ['bin', 'lib', 'doc', 'src', 'dbg']:
             script = os.path.join( self.packageDir(), "post-install-%s.%s" ) % (pkgtype, scriptExt)
             scriptName = "post-install-%s-%s.%s" % ( self.package, pkgtype, scriptExt )
             # are there any cases there installDir should be honored ?
             destscript = os.path.join( self.imageDir(), "manifest", scriptName )
             if not os.path.exists( os.path.join( self.imageDir(), "manifest" ) ):
                 utils.createDir( os.path.join( self.imageDir(), "manifest" ) )
             if os.path.exists( script ):
                 utils.copyFile( script, destscript )
             script = os.path.join( self.packageDir(), "post-uninstall-%s.%s" ) % (pkgtype, scriptExt)
             scriptName = "post-uninstall-%s-%s.%s" % ( self.package, pkgtype, scriptExt )
             # are there any cases there installDir should be honored ?
             destscript = os.path.join( self.imageDir(), "manifest", scriptName )
             if not os.path.exists( os.path.join( self.imageDir(), "manifest" ) ):
                 utils.createDir( os.path.join( self.imageDir(), "manifest" ) )
             if os.path.exists( script ):
                 utils.copyFile( script, destscript )
-
-        if self.subinfo.options.package.withDigests:
-            if self.subinfo.options.package.packageFromSubDir:
-                filesDir = os.path.join(self.imageDir(), self.subinfo.options.package.packageFromSubDir)
-            else:
-                filesDir = self.imageDir()
         return True
 
     def unittest( self ):
         """running unittests"""
         return True
 
     def ccacheOptions(self):
         return ""
 
     def clangOptions(self):
         return ""
diff --git a/bin/Packager/SevenZipPackager.py b/bin/Packager/SevenZipPackager.py
index 45aa6c6d5..04a16758f 100644
--- a/bin/Packager/SevenZipPackager.py
+++ b/bin/Packager/SevenZipPackager.py
@@ -1,49 +1,49 @@
 #
 # copyright (c) 2010 Ralf Habacker <ralf.habacker@freenet.de>
 #
 # creates a 7z archive from the whole content of the package image
 # directory or optional from a sub directory of the image directory
 
 # This packager is in an experimental state - the implementation
 # and features may change in further versions
 
 # TODO:
 # - password support
 # - self extraction archives
 #
 #
 import EmergeDebug
 from Packager.PackagerBase import *
 
 class SevenZipPackager (PackagerBase):
     """Packager using the 7za command line tool from the dev-utils/7zip package"""
     def __init__( self, initialized = False ):
         if not initialized: PackagerBase.__init__( self )
         self.packagerExe = utils.UtilsCache.findApplication("7za")
 
     def _compress(self, archiveName, sourceDir, destDir):
         utils.deleteFile(archiveName)
         cmd = "%s a -r %s %s/*" % (self.packagerExe, os.path.join(destDir, archiveName), sourceDir )
         cmd += " -bsp1"
         if EmergeDebug.verbose() <= 1:
             cmd += " -bso0"
         if not utils.system(cmd):
             EmergeDebug.die("while packaging. cmd: %s" % cmd)
 
     def createPackage(self):
         """create 7z package with digest files located in the manifest subdir"""
 
         if not self.packagerExe:
             EmergeDebug.die("could not find 7za in your path!")
 
-        if emergeSettings.get("ContinuousIntegration", "Cache"):
+        if emergeSettings.getboolean("ContinuousIntegration", "Cache"):
             dstpath = os.path.join(EmergeStandardDirs.downloadDir(), "binary")
         else:
             dstpath = self.packageDestinationDir()
         self._compress(self.binaryArchiveName(), self.imageDir(), dstpath)
         if not self.subinfo.options.package.packSources:
             return True
-
-        self._compress(self.binaryArchiveName("-src"), self.sourceDir(), dstpath)
+        if emergeSettings.getboolean("Packager", "PackageSrc", "True"):
+            self._compress(self.binaryArchiveName("-src"), self.sourceDir(), dstpath)
         return True
 
diff --git a/kdesettings.ini b/kdesettings.ini
index 9d4ae5a96..29bfdaeb1 100644
--- a/kdesettings.ini
+++ b/kdesettings.ini
@@ -1,169 +1,171 @@
 ## This is the settings file for use with powershell.
 ## Copy it to your emerge/../etc and call ". .\kdeenv.ps1" or "kdeenv.bat" in your emerge checkout.
 ## You can use cmake like variables for values in the same section.
 ## See Paths/${DOWNLOADDIR}
 
 [General]
 
 ## Here you set the compiler to be used.
 ## mingw4   - use the mingw gcc compiler (recommended)
 ## msvc2010, msvc2012, msvc2013 or msvc2015 - use the Microsoft Visual C++ compiler
 KDECompiler = mingw4
 ##  possible values x86 or x64
 Architecture = x86
 ## This option should be set to False if you use the msvc 201X Express Edition 64bit compiler
 ## in all other cases, simply keep this option commented out
 #Native=False
 
 ## This option can be used to enable a notification backend.
 ## As soon as the buildprocess of a project has finished a notification will be displayed.
 ## Possible Backends:
 ## Snarl      http://snarl.fullphat.net/
 ## Toaster    Toaster will display a Windows 8 toast notification
 ## Snore      https://github.com/Snorenotify/Snorenotify. Snore supports multiple backends. You need to install snore-send using emerge.
 ## Pushover   https://pushover.net - Pushover is a service to receive instant push notifications on your phone or tablet from a variety of sources.
 ##            If using pushover, you may also need to set EMERGE_PUSHOVER_APP_TOKEN (emerge will use a default Token if unset) and EMERGE_PUSHOVER_USER_KEY, which is your user key
 #EMERGE_USE_NOTIFY = Snarl;Toaster;Pushover
 #EMERGE_PUSHOVER_APP_TOKEN = aJU9PRUb6nGUUM2idyLfXdU8S5q18i
 #EMERGE_PUSHOVER_USER_KEY = 
 
 ## Speed up the merging of packages by using hard links
 UseHardlinks = True
 
 
 [Paths]
 ## This is the location of your python installation.
 ## This value must be set.
 Python = C:\ProgramFiles\Python 
 
 ## Some applications may need python 2.7
 #Python27 = C:\python27
 
 ## Here you change the download directory.
 ## If you want, so you can share the same download directory between
 ## mingw and msvc.
 ## The default value is emerge/../download
 #DownloadDir = C:\kde\download
 
 ## This option defines the location for git checkouts.
 ## The default value is emerge/../download/git
 #KDEGitDir = ${DOWNLOADDIR}\git
 
 ## This option defines the location for svn checkouts.
 ## The default value is emerge/../download/svn
 #KDESVNDir = ${DOWNLOADDIR}\svn
 
 ## This option defines the location where the ccache files are stored.
 ## The default location is KDEROOT/build/ccache
 #CCACHE_DIR = C:\CCACHE\kf5
 
 [Compile]
 ## Whether to build tests (default: True)
 #BuildTests = False
 
 ## the buildtype of this installation
 ## Possible Values:
 ## Release
 ## RelWithDebInfo
 ## Debug
 ## MinSizeRel
 BuildType = RelWithDebInfo
 
 ## Whether to use ninja (default: False)
 UseNinja = True
 
 ## Whether to use ccache (only avalible with mingw compiler)
 #UseCCache = True
 
 ## This option can be used to override the default make program
 ## change the value to the path of the executable you want to use instead.
 MakeProgram = jom
 
 [ShortPath]
 ## substitute pathes by drives
 ## This option is needed to avoid path limit problems in case of long base pathes
 ## and compiling big packages like qt
 ## If you disable it do _not_ use any paths longer than 6 letters in the
 ## directory settings
 EMERGE_USE_SHORT_PATH = False
 
 ## each drive could be commented out to skip substution
 EMERGE_ROOT_DRIVE = r:
 EMERGE_GIT_DRIVE = q:
 #EMERGE_DOWNLOAD_DRIVE = t:
 
 
 [Portage]
 ## This adds the possibility to disable cretin packages
 ## For portage recipes configure options can be added by 
 ## "if self.subinfo.options.isActive("binary/mysql-pkg"):"
 ## Ignores = dev-util/git;dev-util/msys;kdesupport/kdewin;win32libs/boost/boost-python
 Ignores = 
 
 [PortageVersions]
 ## Override the default target if this version is available.
 #DefaultTarget = 5.0
 
 ## Overide the default version for a package.
 ## For a normal package add category/package, like win32libs/libpng and set the Version
 ## For meta packages like Qt5 you can directly set the version for the whole package
 #Qt5 = 5.2.1
 #KF5 = 5.2.0
 #KDE = 4.89.0
 #Boost = 1_55_0
 #win32libs/libpng = 1.2.43
 #binary/vlc = 3.0.0-git
 
 [Packager]
 ## The archive type for packages.
 ## Possible values are: zip, 7z
 ## Todo: rename
 7ZipArchiveType = zip
 
 ## If set this will override the default package type.
-## Possible values are: SevenZipPackager, KDEWinPackager, 
-##                      MSIFragmentPackager, InnoSetupPackager, NullsoftInstallerPackager
+## Possible values are: SevenZipPackager,  MSIFragmentPackager,
+##                      InnoSetupPackager, NullsoftInstallerPackager
 #PackageType = SevenZipPackager
 
+## Package the Source files too.
+#PackageSrc=False
 
 [EmergeDebug]
 ## If you want to have verbose output, uncomment the following option
 ## and set it to positive integer for verbose output and to 0
 ## (or disable it) for normal output. Currently the highest verbosity level
 ## is 3 (equal to 'emerge -v -v -v'). level -1 equals 'emerge -q'
 ## Default is Verbose = 0
 #Verbose = 1
 
 ## Prints time spend on various emerge tasks
 MeasureTime = False
 
 ## Dump internal state of emergeSettings to kdesettings.ini.dump
 #DumpSettings = True
 
 [Environment]
 ## All values defined here will be populated to the environment
 #GIT_COMMITTER_EMAIL = foo@bar.com
 
 ## Set the ssh client for git and svn.
 GIT_SSH = plink
 SVN_SSH = plink
 
 
 [QtSDK]
 ## This is higly experimental and you will miss certain features like dbus or mysql support.
 ## Whether to use prebuild Qt binaries.
 Enabled = False
 ## The path to the Qt sdk.
 Path = D:\Qt
 ## The version of Qt.
 Version = 5.3
 ## The compiler version, if you are not sure what to use, have a look into the derectory set in QtSDK/Path.
 ## The compiler must be of the same type as General/KDECOMPILER.
 ## If you are using mingw please make sure you have installed the mingw using the Qt installer.
 Compiler = mingw482_32
 
 [ContinuousIntegration]
 BinaryUrl = ""
 
 [Version]
 EMERGE_SETTINGS_VERSION = 2
diff --git a/portage/extragear/kmymoney/blacklist.txt b/portage/extragear/kmymoney/blacklist.txt
new file mode 100644
index 000000000..485a754af
--- /dev/null
+++ b/portage/extragear/kmymoney/blacklist.txt
@@ -0,0 +1,62 @@
+# blacklist
+
+# general
+manifest\\.*
+.*\.exp
+.*\.pdb
+.*\.la
+.*\.nsis
+.*\.prl
+
+# multiple docs
+doc\\.*
+share\\man\\.*
+share\\xml\\.*
+share\\locale\\.*
+
+# cmake stuff
+share\\apps\\cmake\\.*
+
+# common app stuff
+share\\apps\\ark\\.*
+share\\apps\\kgpg\\.*
+share\\kf5\\kdoctools\\.*
+
+# Unused Qt modules
+qml\\QtMultimedia
+qml\\QtWebChannel
+qml\\QtWebKit
+qml\\QtWinExtras
+qml\\QtTest
+
+# unrelated
+dev-utils\\.*
+share\\dbus-1\\services\\.*
+share\\pkgconfig\\.*
+
+# cleanup breeze stuff
+share\\wallpapers\\.*
+share\\icons\\Breeze_Snow\\.*
+share\\icons\\breeze-dark\\.*
+
+# cut the big oxygen icons: this can lead to errors though if used!!!!
+share\\icons\\oxygen\\64x64\\.*
+share\\icons\\oxygen\\128x128\\.*
+share\\icons\\oxygen\\256x256\\.*
+
+# doubled qt dlls
+lib\\[^\\]*\.dll
+# more qt leftovers
+translations\\.*
+phrasebooks\\.*
+mkspecs\\.*
+
+# unneeded stuff from bin\
+bin\\qt\.conf
+bin\\syncqt\.pl
+
+bin\\dbus-*\.exe
+bin\\dbus-env\.bat
+
+# strip most executables
+bin\\(?!(kdevelop|kbuildsycoca5|update-mime-database|kioslave)).*\.exe
\ No newline at end of file
diff --git a/portage/extragear/kmymoney/kmymoney.ico b/portage/extragear/kmymoney/kmymoney.ico
new file mode 100644
index 000000000..27b242917
Binary files /dev/null and b/portage/extragear/kmymoney/kmymoney.ico differ
diff --git a/portage/extragear/kmymoney/kmymoney.py b/portage/extragear/kmymoney/kmymoney.py
index 62b5db722..801145cb1 100644
--- a/portage/extragear/kmymoney/kmymoney.py
+++ b/portage/extragear/kmymoney/kmymoney.py
@@ -1,28 +1,60 @@
 import info
 
 class subinfo(info.infoclass):
     def setTargets( self ):
         self.svnTargets['master'] = '[git]kde:kmymoney|master'
         self.defaultTarget = 'master'
 
     def setDependencies( self ):
         self.dependencies['frameworks/kcmutils'] = 'default'
         self.dependencies['frameworks/kdelibs4support'] = 'default'
         self.dependencies['frameworks/khtml'] = 'default'
-        self.dependencies['testing/gpgmepp'] = 'default'
+        #self.dependencies['testing/gpgmepp'] = 'default'
         self.dependencies['testing/kholidays'] = 'default'
         self.dependencies['binary/mysql-pkg'] = 'default'
         self.dependencies['win32libs/sqlite'] = 'default'
         #self.dependencies['win32libs/libofx'] = 'default'
         self.dependencies['win32libs/gettext'] = 'default'
         self.dependencies['extragear/libalkimia'] = 'default'
         self.dependencies['extragear/kdiagram'] = 'default'
         self.buildDependencies['dev-util/gettext-tools'] = 'default'
         self.shortDescription = "a personal finance manager for KDE"
 
 from Package.CMakePackageBase import *
+from Packager.NullsoftInstallerPackager import *
 
-class Package(CMakePackageBase):
+class Package( CMakePackageBase, NullsoftInstallerPackager ):
     def __init__( self):
-        CMakePackageBase.__init__(self)
+        CMakePackageBase.__init__( self )
+        blacklists = [
+            NSIPackagerLists.runtimeBlacklist,
+            os.path.join(os.path.dirname(__file__), 'blacklist.txt')
+        ]
+        NullsoftInstallerPackager.__init__(self, blacklists=blacklists)
+
+    def createPackage(self):
+        self.defines[ "productname" ] = "KMyMoney"
+        self.defines[ "executable" ] = "bin\\kmymoney.exe"
+        self.defines[ "icon" ] = os.path.join(os.path.dirname(__file__), "kmymoney.ico")
+
+        self.ignoredPackages.append("binary/mysql-pkg")
+
+        return NullsoftInstallerPackager.createPackage(self)
+
+    def preArchive(self):
+        archiveDir = self.archiveDir()
+        # TODO: Why is that needed?
+        os.mkdir(os.path.join(archiveDir, "etc", "dbus-1", "session.d"))
+
+        # TODO: Can we generalize this for other apps?
+        # move everything to the location where Qt expects it
+        binPath = os.path.join(archiveDir, "bin")
+
+        utils.mergeTree(os.path.join(archiveDir, "plugins"), binPath)
+        utils.mergeTree(os.path.join(archiveDir, "lib", "plugins"), binPath)
+        utils.mergeTree(os.path.join(archiveDir, "qml"), os.path.join(archiveDir, binPath))
+        utils.mergeTree(os.path.join(archiveDir, "lib", "qml"), os.path.join(archiveDir, binPath))
+
+        # TODO: Just blacklisting this doesn't work. WTF?
+        utils.rmtree(os.path.join(archiveDir, "dev-utils"))
 
diff --git a/portage/libs/qt5/qtbase/0001-Fix-toDisplayString-QUrl-PreferLocalFile-on-Win.patch b/portage/libs/qt5/qtbase/0001-Fix-toDisplayString-QUrl-PreferLocalFile-on-Win.patch
deleted file mode 100644
index 272381793..000000000
--- a/portage/libs/qt5/qtbase/0001-Fix-toDisplayString-QUrl-PreferLocalFile-on-Win.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-diff --git a/src/corelib/io/qurl.cpp b/src/corelib/io/qurl.cpp
-index 89f5aad..5c98c70 100644
---- a/src/corelib/io/qurl.cpp
-+++ b/src/corelib/io/qurl.cpp
-@@ -556,6 +556,7 @@ public:
-     inline bool hasFragment() const { return sectionIsPresent & Fragment; }
- 
-     inline bool isLocalFile() const { return flags & IsLocalFile; }
-+	QString toLocalFile(QUrl::FormattingOptions options) const;
- 
-     QString mergePaths(const QString &relativePath) const;
- 
-@@ -1460,6 +1461,33 @@ inline void QUrlPrivate::parse(const QString &url, QUrl::ParsingMode parsingMode
-         validateComponent(Fragment, url, hash + 1, len);
- }
- 
-+QString QUrlPrivate::toLocalFile(QUrl::FormattingOptions options) const
-+{
-+    QString tmp;
-+    QString ourPath;
-+    appendPath(ourPath, options, QUrlPrivate::Path);
-+
-+    // magic for shared drive on windows
-+    if (!host.isEmpty()) {
-+        tmp = QStringLiteral("//") + host;
-+#ifdef Q_OS_WIN // QTBUG-42346, WebDAV is visible as local file on Windows only.
-+        if (scheme == webDavScheme())
-+            tmp = webDavSslTag();
-+#endif
-+        if (!ourPath.isEmpty() && !ourPath.startsWith(QLatin1Char('/')))
-+            tmp = QLatin1Char('/');
-+        tmp = ourPath;
-+    } else {
-+        tmp = ourPath;
-+#ifdef Q_OS_WIN
-+        // magic for drives on windows
-+        if (ourPath.length() > 2 && ourPath.at(0) == QLatin1Char('/') && ourPath.at(2) == QLatin1Char(':'))
-+            tmp.remove(0, 1);
-+#endif
-+    }
-+    return tmp;
-+}
-+
- /*
-     From http://www.ietf.org/rfc/rfc3986.txt, 5.2.3: Merge paths
- 
-@@ -3255,7 +3283,7 @@ QString QUrl::toString(FormattingOptions options) const
-             && (!d->hasQuery() || options.testFlag(QUrl::RemoveQuery))
-             && (!d->hasFragment() || options.testFlag(QUrl::RemoveFragment))
-             && isLocalFile()) {
--        return path(options);
-+        return d->toLocalFile(options);
-     }
- 
-     QString url;
-@@ -3817,29 +3845,8 @@ QString QUrl::toLocalFile() const
-     // the call to isLocalFile() also ensures that we're parsed
-     if (!isLocalFile())
-         return QString();
--
--    QString tmp;
--    QString ourPath = path(QUrl::FullyDecoded);
--
--    // magic for shared drive on windows
--    if (!d->host.isEmpty()) {
--        tmp = QStringLiteral("//") + host();
--#ifdef Q_OS_WIN // QTBUG-42346, WebDAV is visible as local file on Windows only.
--        if (scheme() == webDavScheme())
--            tmp += webDavSslTag();
--#endif
--        if (!ourPath.isEmpty() && !ourPath.startsWith(QLatin1Char('/')))
--            tmp += QLatin1Char('/');
--        tmp += ourPath;
--    } else {
--        tmp = ourPath;
--#ifdef Q_OS_WIN
--        // magic for drives on windows
--        if (ourPath.length() > 2 && ourPath.at(0) == QLatin1Char('/') && ourPath.at(2) == QLatin1Char(':'))
--            tmp.remove(0, 1);
--#endif
--    }
--    return tmp;
-+    
-+    return d->toLocalFile(QUrl::FullyDecoded);
- }
- 
- /*!
-diff --git a/tests/auto/corelib/io/qurl/tst_qurl.cpp b/tests/auto/corelib/io/qurl/tst_qurl.cpp
-index 7579c67..4dd3963 100644
---- a/tests/auto/corelib/io/qurl/tst_qurl.cpp
-+++ b/tests/auto/corelib/io/qurl/tst_qurl.cpp
-@@ -69,6 +69,8 @@ private slots:
-     void resolving();
-     void toString_data();
-     void toString();
-+	void toString_PreferLocalFile_data();
-+	void toString_PreferLocalFile();
-     void toString_constructed_data();
-     void toString_constructed();
-     void toAndFromStringList_data();
-@@ -1049,6 +1051,30 @@ void tst_QUrl::toString()
-     QCOMPARE(url.adjusted(opt).toString(), string);
- }
- 
-+void tst_QUrl::toString_PreferLocalFile_data()
-+{
-+    QTest::addColumn<QUrl>("url");
-+    QTest::addColumn<QString>("string");
-+
-+#ifdef Q_OS_WIN
-+    QTest::newRow("win-drive") << QUrl(QString::fromLatin1("file:///c:/windows/regedit.exe"))
-+                               << QString::fromLatin1("c:/windows/regedit.exe");
-+    QTest::newRow("win-share") << QUrl(QString::fromLatin1("//Anarki/homes"))
-+                               << QString::fromLatin1("//anarki/homes");
-+#else
-+    QTest::newRow("unix-path") << QUrl(QString::fromLatin1("file:///tmp"))
-+                               << QString::fromLatin1("/tmp");
-+#endif
-+}
-+
-+void tst_QUrl::toString_PreferLocalFile()
-+{
-+    QFETCH(QUrl, url);
-+    QFETCH(QString, string);
-+
-+    QCOMPARE(url.toString(QUrl::PreferLocalFile), string);
-+}
-+
- void tst_QUrl::toAndFromStringList_data()
- {
-     QTest::addColumn<QStringList>("strings");
diff --git a/portage/libs/qt5/qtbase/qmake-5.4.patch b/portage/libs/qt5/qtbase/qmake-5.4.patch
deleted file mode 100644
index 4655e1652..000000000
--- a/portage/libs/qt5/qtbase/qmake-5.4.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
-index 804eab9..ad44e87 100644
---- a/qmake/generators/makefile.cpp
-+++ b/qmake/generators/makefile.cpp
-@@ -1214,7 +1214,7 @@ MakefileGenerator::filePrefixRoot(const QString &root, const QString &path)
- {
-     QString ret(root + path);
-     if(path.length() > 2 && path[1] == ':') //c:\foo
--        ret = QString(path.mid(0, 2) + root + path.mid(2));
-+        ret = QString(root + path.mid(2));
-     while(ret.endsWith("\\"))
-         ret = ret.left(ret.length()-1);
-     return ret;
diff --git a/portage/libs/qt5/qtbase/qmake-5.5.patch b/portage/libs/qt5/qtbase/qmake-5.5.patch
deleted file mode 100644
index 5a0446b9a..000000000
--- a/portage/libs/qt5/qtbase/qmake-5.5.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
-index f2decd7..d8ec64f 100644
---- a/qmake/generators/makefile.cpp
-+++ b/qmake/generators/makefile.cpp
-@@ -1172,7 +1172,7 @@ MakefileGenerator::filePrefixRoot(const QString &root, const QString &path)
- {
-     QString ret(path);
-     if(path.length() > 2 && path[1] == ':') //c:\foo
--        ret.insert(2, root);
-+        ret.replace(0, 2, root);
-     else
-         ret.prepend(root);
-     while (ret.endsWith('\\'))
diff --git a/portage/libs/qt5/qtbase/qtbase-20130714.patch b/portage/libs/qt5/qtbase/qtbase-20130714.patch
deleted file mode 100644
index 86d589751..000000000
--- a/portage/libs/qt5/qtbase/qtbase-20130714.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf
-index 9f0188b..8125bf9 100644
---- a/mkspecs/win32-g++/qmake.conf
-+++ b/mkspecs/win32-g++/qmake.conf
-@@ -30,6 +30,7 @@ QMAKE_CFLAGS_DEPS       = -M
- QMAKE_CFLAGS_WARN_ON    = -Wall -Wextra
- QMAKE_CFLAGS_WARN_OFF   = -w
- QMAKE_CFLAGS_RELEASE    = -O2
-+QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO = -O2 -g
- QMAKE_CFLAGS_DEBUG      = -g
- QMAKE_CFLAGS_YACC       = -Wno-unused -Wno-parentheses
- QMAKE_CFLAGS_SPLIT_SECTIONS = -ffunction-sections
-diff --git a/src/corelib/io/qstandardpaths_win.cpp b/src/corelib/io/qstandardpaths_win.cpp
-index 5e56db3..4d46430 100644
---- a/src/corelib/io/qstandardpaths_win.cpp
-+++ b/src/corelib/io/qstandardpaths_win.cpp
-@@ -214,6 +214,16 @@ QStringList QStandardPaths::standardLocations(StandardLocation type)
-                     dirs.append(QCoreApplication::applicationDirPath());
-                     dirs.append(QCoreApplication::applicationDirPath() + QLatin1String("/data"));
-                 }
-+                dirs.append(QCoreApplication::applicationDirPath() + QLatin1String("/../share"));
-+                if (type != GenericDataLocation && type != GenericConfigLocation) {
-+                    QString appData = QCoreApplication::applicationDirPath() + QLatin1String("/../share");
-+                    if (!QCoreApplication::organizationName().isEmpty())
-+                        appData += QLatin1Char('/') + QCoreApplication::organizationName();
-+                    if (!QCoreApplication::applicationName().isEmpty())
-+                        appData += QLatin1Char('/') + QCoreApplication::applicationName();
-+					dirs.append(appData);
-+				}
-+                dirs.append(QCoreApplication::applicationDirPath() + QLatin1String("/../etc/xdg"));
- #endif
-             }
-             break;
-diff --git a/src/gui/image/qiconloader.cpp b/src/gui/image/qiconloader.cpp
-index 06491f1..ef9436f 100644
---- a/src/gui/image/qiconloader.cpp
-+++ b/src/gui/image/qiconloader.cpp
-@@ -157,6 +157,7 @@ QStringList QIconLoader::themeSearchPaths() const
- {
-     if (m_iconDirs.isEmpty()) {
-         m_iconDirs = systemIconSearchPaths();
-+        m_iconDirs.append(QCoreApplication::applicationDirPath() + QLatin1String("/../share/icons"));
-         // Always add resource directory as search path
-         m_iconDirs.append(QLatin1String(":/icons"));
-     }
-diff --git a/src/plugins/platforms/windows/qwindowstheme.cpp b/src/plugins/platforms/windows/qwindowstheme.cpp
-index 66735d8..5731560 100644
---- a/src/plugins/platforms/windows/qwindowstheme.cpp
-+++ b/src/plugins/platforms/windows/qwindowstheme.cpp
-@@ -321,6 +321,8 @@ static inline QStringList iconThemeSearchPaths()
- static inline QStringList styleNames()
- {
-     QStringList result;
-+    result.append(QStringLiteral("breeze"));
-+    result.append(QStringLiteral("oxygen"));
-     if (QSysInfo::WindowsVersion >= QSysInfo::WV_VISTA)
-         result.append(QStringLiteral("WindowsVista"));
-     if (QSysInfo::WindowsVersion >= QSysInfo::WV_XP)
-@@ -382,6 +384,10 @@ QVariant QWindowsTheme::themeHint(ThemeHint hint) const
-         return QVariant(booleanSystemParametersInfo(SPI_GETSNAPTODEFBUTTON, false));
-     case ContextMenuOnMouseRelease:
-         return QVariant(true);
-+    case QPlatformTheme::SystemIconThemeName:
-+         return QVariant(QLatin1String("breeze"));
-+    case QPlatformTheme::SystemIconFallbackThemeName:
-+        return QVariant(QLatin1String("oxygen"));
-     default:
-         break;
-     }
-diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
-index 6e9d4aa..9fff1aa 100644
---- a/tools/configure/configureapp.cpp
-+++ b/tools/configure/configureapp.cpp
-@@ -2942,7 +2942,7 @@ void Configure::generateOutputVars()
-     if (dictionary[ "DBUS" ] != "no") {
-        if (!dbusPath.isEmpty()) {
-            qmakeVars += QString("QT_CFLAGS_DBUS = -I%1/include").arg(dbusPath);
--           qmakeVars += QString("QT_LIBS_DBUS = -L%1/lib").arg(dbusPath);
-+           qmakeVars += QString("QT_LIBS_DBUS = -L%1/lib -ldbus-1").arg(dbusPath);
-            if (dbusHostPath.isEmpty())
-                qmakeVars += QString("QT_HOST_CFLAGS_DBUS = -I%1/include").arg(dbusPath);
-        }
-@@ -2951,7 +2951,7 @@ void Configure::generateOutputVars()
-     }
-     if (dictionary[ "SQL_MYSQL" ] != "no" && !mysqlPath.isEmpty()) {
-         qmakeVars += QString("QT_CFLAGS_MYSQL = -I%1/include").arg(mysqlPath);
--        qmakeVars += QString("QT_LFLAGS_MYSQL = -L%1/lib").arg(mysqlPath);
-+        qmakeVars += QString("QT_LFLAGS_MYSQL = -L%1/lib -llibmysql").arg(mysqlPath);
-     }
-     if (!psqlLibs.isEmpty())
-         qmakeVars += QString("QT_LFLAGS_PSQL=") + psqlLibs.section("=", 1);
diff --git a/portage/libs/qt5/qtbase/qtbase-5.6.0.patch b/portage/libs/qt5/qtbase/qtbase-5.6.0.patch
deleted file mode 100644
index f084d1d99..000000000
--- a/portage/libs/qt5/qtbase/qtbase-5.6.0.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
-index a54083c..ab2b006 100644
---- a/qmake/generators/makefile.cpp
-+++ b/qmake/generators/makefile.cpp
-@@ -1183,7 +1183,7 @@ MakefileGenerator::filePrefixRoot(const QString &root, const QString &path)
- {
-     QString ret(path);
-     if(path.length() > 2 && path[1] == ':') //c:\foo
--        ret.insert(2, root);
-+        ret.replace(0, 2, root);
-     else
-         ret.prepend(root);
-     while (ret.endsWith('\\'))
-diff --git a/src/corelib/io/qstandardpaths_win.cpp b/src/corelib/io/qstandardpaths_win.cpp
-index ed1c14a..2a2dcd1 100644
---- a/src/corelib/io/qstandardpaths_win.cpp
-+++ b/src/corelib/io/qstandardpaths_win.cpp
-@@ -214,6 +214,16 @@ QStringList QStandardPaths::standardLocations(StandardLocation type)
- #ifndef QT_BOOTSTRAPPED
-                 dirs.append(QCoreApplication::applicationDirPath());
-                 dirs.append(QCoreApplication::applicationDirPath() + QLatin1String("/data"));
-+                dirs.append(QCoreApplication::applicationDirPath() + QLatin1String("/../share"));
-+                if (type != GenericDataLocation && type != GenericConfigLocation) {
-+                    QString appData = QCoreApplication::applicationDirPath() + QLatin1String("/../share");
-+                    if (!QCoreApplication::organizationName().isEmpty())
-+                        appData += QLatin1Char('/') + QCoreApplication::organizationName();
-+                    if (!QCoreApplication::applicationName().isEmpty())
-+                        appData += QLatin1Char('/') + QCoreApplication::applicationName();
-+                   dirs.append(appData);
-+               }
-+                dirs.append(QCoreApplication::applicationDirPath() + QLatin1String("/../etc/xdg"));
- #endif
-             }
-             break;
-diff --git a/src/gui/image/qiconloader.cpp b/src/gui/image/qiconloader.cpp
-index 3ead72d..7d39e3d 100644
---- a/src/gui/image/qiconloader.cpp
-+++ b/src/gui/image/qiconloader.cpp
-@@ -149,6 +149,7 @@ QStringList QIconLoader::themeSearchPaths() const
- {
-     if (m_iconDirs.isEmpty()) {
-         m_iconDirs = systemIconSearchPaths();
-+        m_iconDirs.append(QCoreApplication::applicationDirPath() + QLatin1String("/../share/icons"));
-         // Always add resource directory as search path
-         m_iconDirs.append(QLatin1String(":/icons"));
-     }
-diff --git a/src/plugins/platforms/windows/qwindowstheme.cpp b/src/plugins/platforms/windows/qwindowstheme.cpp
-index cc367ff..c9fdab2 100644
---- a/src/plugins/platforms/windows/qwindowstheme.cpp
-+++ b/src/plugins/platforms/windows/qwindowstheme.cpp
-@@ -332,6 +332,8 @@ static inline QStringList iconThemeSearchPaths()
- static inline QStringList styleNames()
- {
-     QStringList result;
-+    result.append(QStringLiteral("breeze"));
-+    result.append(QStringLiteral("oxygen"));
-     if (QSysInfo::WindowsVersion >= QSysInfo::WV_VISTA)
-         result.append(QStringLiteral("WindowsVista"));
-     if (QSysInfo::WindowsVersion >= QSysInfo::WV_XP)
-@@ -395,6 +397,9 @@ QVariant QWindowsTheme::themeHint(ThemeHint hint) const
-         return QVariant(true);
-     case WheelScrollLines:
-         return QVariant(int(dWordSystemParametersInfo(SPI_GETWHEELSCROLLLINES, 3)));
-+    case QPlatformTheme::SystemIconThemeName:
-+    case QPlatformTheme::SystemIconFallbackThemeName:
-+        return QVariant(QLatin1String("breeze"));
-     default:
-         break;
-     }
-diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
-index 160ccf5..575030a 100644
---- a/tools/configure/configureapp.cpp
-+++ b/tools/configure/configureapp.cpp
-@@ -3090,7 +3090,7 @@ void Configure::generateOutputVars()
-     if (dictionary[ "DBUS" ] == "linked") {
-        if (!dbusPath.isEmpty()) {
-            qmakeVars += QString("QT_CFLAGS_DBUS = -I%1/include").arg(dbusPath);
--           qmakeVars += QString("QT_LIBS_DBUS = -L%1/lib").arg(dbusPath);
-+           qmakeVars += QString("QT_LIBS_DBUS = -L%1/lib -ldbus-1").arg(dbusPath);
-            if (dbusHostPath.isEmpty())
-                qmakeVars += QString("QT_HOST_CFLAGS_DBUS = -I%1/include").arg(dbusPath);
-        }
-@@ -3099,7 +3099,7 @@ void Configure::generateOutputVars()
-     }
-     if (dictionary[ "SQL_MYSQL" ] != "no" && !mysqlPath.isEmpty()) {
-         qmakeVars += QString("QT_CFLAGS_MYSQL = -I%1/include").arg(mysqlPath);
--        qmakeVars += QString("QT_LFLAGS_MYSQL = -L%1/lib").arg(mysqlPath);
-+        qmakeVars += QString("QT_LFLAGS_MYSQL = -L%1/lib -llibmysql").arg(mysqlPath);
-     }
-     if (!psqlLibs.isEmpty())
-         qmakeVars += QString("QT_LFLAGS_PSQL=") + psqlLibs.section("=", 1);
diff --git a/portage/libs/qt5/qtbase/qtbase.py b/portage/libs/qt5/qtbase/qtbase.py
index 2c4320536..c4a84df1a 100644
--- a/portage/libs/qt5/qtbase/qtbase.py
+++ b/portage/libs/qt5/qtbase/qtbase.py
@@ -1,161 +1,150 @@
 # -*- coding: utf-8 -*-
 
 import os
 
 import utils
 import info
 import portage
 import compiler
 from EmergeOS.osutils import OsUtils
 from Package.Qt5CorePackageBase import *
 
 
 class subinfo(info.infoclass):
     def setTargets( self ):
         self.versionInfo.setDefaultValues( )
             
         for ver in self.versionInfo.tarballs() + self.versionInfo.branches() + self.versionInfo.tags():
-            if ver.startswith("5.6.0"):
-                self.patchToApply[ ver ] = [("qtbase-5.6.0.patch" , 1)]
-            elif ver.startswith("5.6"):
+            if ver.startswith("5.6"):
                 self.patchToApply[ ver ] = [("qtbase-5.6.patch" , 1)]
             elif ver.startswith("5.7"):
                 self.patchToApply[ver] = [("qtbase-5.7.patch", 1)]
-            else:
-                self.patchToApply[ ver ] = [("qtbase-20130714.patch" , 1),]
-                if ver.startswith("5.4"):
-                    self.patchToApply[ ver ].append(("qmake-5.4.patch" , 1))
-                if ver.startswith("5.5"):
-                    self.patchToApply[ ver ] += [
-                        ("qmake-5.5.patch" , 1),
-                        ("0001-Fix-toDisplayString-QUrl-PreferLocalFile-on-Win.patch", 1)
-                    ]
-        
+
         self.shortDescription = "a cross-platform application framework"
 
 
     def setDependencies( self ):
         self.buildDependencies['virtual/base'] = 'default'
         self.buildDependencies['dev-util/perl'] = 'default'
         self.buildDependencies['dev-util/winflexbison'] = 'default'
         if not self.options.buildStatic:
             self.dependencies['win32libs/openssl'] = 'default'
             self.dependencies['win32libs/dbus'] = 'default'
             self.dependencies['binary/mysql-pkg'] = 'default'
             self.dependencies['win32libs/icu'] = 'default'
             self.dependencies['win32libs/zlib'] = 'default'
 
 class Package(Qt5CorePackageBase):
     def __init__( self, **args ):
         Qt5CorePackageBase.__init__(self)
 
 
     def configure( self, unused1=None, unused2=""):
         self.enterBuildDir()
         self.setPathes()
         if OsUtils.isWin():
             configure = os.path.join( self.sourceDir() ,"configure.bat" ).replace( "/", "\\" )
         elif OsUtils.isUnix():
             configure = os.path.join( self.sourceDir() ,"configure" )
 
 
         command = " %s -opensource  -confirm-license -prefix %s -platform %s " % ( configure, EmergeStandardDirs.emergeRoot(), self.platform )
         if self.buildType() == "Debug":
             command += "-debug "
         else:
             command += "-release "
 
         if self.buildType() == "RelWithDebInfo":
                 command += "-force-debug-info "
 
         if self.subinfo.options.buildStatic:
                 command += " -static -static-runtime "
 
         command += "-nomake examples "
         command += "-nomake tests "
 
 
 
 
         if OsUtils.isWin():
             if not os.path.exists(os.path.join(self.sourceDir(), ".gitignore")):  # force bootstrap of configure.exe
                 with open(os.path.join(self.sourceDir(), ".gitignore"), "wt+") as bootstrap:
                     bootstrap.write("Force Bootstrap")
                 if os.path.exists(os.path.join(self.sourceDir(), "configure.exe")):
                     os.remove(os.path.join(self.sourceDir(), "configure.exe"))
             configure = os.path.join(self.sourceDir(), "configure.bat").replace("/", "\\")
             command = " %s -opensource  -confirm-license -prefix %s -platform %s " % (
             configure, EmergeStandardDirs.emergeRoot(), self.platform)
             command += "-headerdir %s " % os.path.join(EmergeStandardDirs.emergeRoot(), "include", "qt5")
             command += "-plugin-sql-odbc "
             command += "-qt-style-windowsxp  -qt-style-windowsvista "
             command += "-qt-libpng "
             command += "-qt-libjpeg "
             command += "-qt-pcre "
             command += "-nomake examples "
             # can we drop that in general?
             if not self.subinfo.buildTarget.startswith("5.7"):
                 command += "-c++11 "
             command += "-opengl dynamic "
             command += "-ltcg "
             if self.buildType() == "RelWithDebInfo":
                 command += "-force-debug-info "
             command += "-I \"%s\" -L \"%s\" " % (os.path.join(EmergeStandardDirs.emergeRoot(), "include"),
                                                  os.path.join(EmergeStandardDirs.emergeRoot(), "lib"))
 
             if not self.subinfo.options.buildStatic:
                 command += " -openssl-linked "
                 if self.subinfo.options.isActive("binary/mysql-pkg"):
                     command += " -plugin-sql-mysql "
                 if self.subinfo.options.isActive("win32libs/dbus"):
                     command += " -qdbus -dbus-linked "
                 if self.subinfo.options.isActive("win32libs/icu"):
                     command += " -icu "
                 if self.subinfo.options.isActive("win32libs/zip"):
                     command += " -system-zlib "
                     if compiler.isMSVC():
                         command += " ZLIB_LIBS=zlib.lib "
 
         if OsUtils.isUnix() or self.supportsCCACHE:
             command += "-no-pch "
 
         print("command: ", command)
         if not utils.system( command ):
             return False
         return True
 
     def make(self, unused=''):
         self.setPathes()
         return Qt5CorePackageBase.make(self)
 
 
     def install( self ):
         self.setPathes()
         if not Qt5CorePackageBase.install(self):
             return False
         utils.copyFile( os.path.join( self.buildDir(), "bin", "qt.conf"), os.path.join( self.imageDir(), "bin", "qt.conf" ) )
             
         # install msvc debug files if available
         if compiler.isMSVC():
             srcdir = os.path.join( self.buildDir(), "lib" )
             destdir = os.path.join( self.installDir(), "lib" )
 
             filelist = os.listdir( srcdir )
 
             for file in filelist:
                 if file.endswith( ".pdb" ):
                     utils.copyFile( os.path.join( srcdir, file ), os.path.join( destdir, file ) )
 
         return True
         
          
          
     def setPathes( self ):
          # for building qt with qmake       
         utils.prependPath(os.path.join(self.buildDir(),"bin"))
         # so that the mkspecs can be found, when -prefix is set
         utils.putenv( "QMAKEPATH", self.sourceDir() )
         utils.putenv( "QMAKESPEC", os.path.join(self.sourceDir(), 'mkspecs', self.platform ))
 
 
 
diff --git a/portage/libs/qt5/qtwebkit/qtwebkit-20130109.patch b/portage/libs/qt5/qtwebkit/qtwebkit-20130109.patch
deleted file mode 100644
index e8a309350..000000000
--- a/portage/libs/qt5/qtwebkit/qtwebkit-20130109.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff --git a/Tools/qmake/mkspecs/features/default_post.prf b/Tools/qmake/mkspecs/features/default_post.prf
-index 2dbb50c..813525c 100644
---- a/Tools/qmake/mkspecs/features/default_post.prf
-+++ b/Tools/qmake/mkspecs/features/default_post.prf
-@@ -91,12 +91,6 @@ contains(TEMPLATE, derived) {
-     # on Linux and Mac OS X. On Windows we do have a convenience copy in
-     # Qt5's top-level repository, so let's add that to the PATH if we can
-     # find it.
--    win32 {
--        GNUTOOLS_DIR=$$[QT_HOST_DATA]/../gnuwin32/bin
--        exists($$GNUTOOLS_DIR/gperf.exe) {
--            GNUTOOLS = "(set $$escape_expand(\\\")PATH=$$toSystemPath($$GNUTOOLS_DIR);%PATH%$$escape_expand(\\\"))"
--        }
--    }
- 
-     for(generator, GENERATORS) {
-         eval($${generator}.CONFIG = target_predeps no_link)
-diff --git a/Tools/qmake/mkspecs/features/default_pre.prf b/Tools/qmake/mkspecs/features/default_pre.prf
-index 38443a4..1ab3fb7 100644
---- a/Tools/qmake/mkspecs/features/default_pre.prf
-+++ b/Tools/qmake/mkspecs/features/default_pre.prf
-@@ -106,7 +106,9 @@ if(win32|mac):!macx-xcode {
- # A newer version of flex is required on Windows. At the moment the only
- # one that appears to provide binaries and is not cygwin is winflex.
- FLEX = flex
-+BISON = bison
- win32: FLEX = win_flex
-+win32: BISON = win_bison
- 
- BIN_EXTENSION =
- win32: BIN_EXTENSION = .exe
-diff --git a/Tools/qmake/mkspecs/features/functions.prf b/Tools/qmake/mkspecs/features/functions.prf
-index 46293fe..dd7be68 100644
---- a/Tools/qmake/mkspecs/features/functions.prf
-+++ b/Tools/qmake/mkspecs/features/functions.prf
-@@ -202,9 +202,6 @@ defineTest(programExistsInPath) {
-     PATH = "$$(PATH)"
-     paths=$$split(PATH, $$QMAKE_DIRLIST_SEP)
- 
--    GNUTOOLS_DIR=$$[QT_HOST_DATA]/../gnuwin32/bin
--    exists($$GNUTOOLS_DIR): paths += $$GNUTOOLS_DIR
--
-     for(p, paths): exists($$p/$$program):return(true)
-     return(false)
- }
diff --git a/portage/libs/qt5/qtwebkit/qtwebkit-5.4.patch b/portage/libs/qt5/qtwebkit/qtwebkit-5.4.patch
deleted file mode 100644
index 4bc1aa283..000000000
--- a/portage/libs/qt5/qtwebkit/qtwebkit-5.4.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/Tools/qmake/mkspecs/features/default_post.prf b/Tools/qmake/mkspecs/features/default_post.prf
-index e07d5e4..06ba893 100644
---- a/Tools/qmake/mkspecs/features/default_post.prf
-+++ b/Tools/qmake/mkspecs/features/default_post.prf
-@@ -87,17 +87,6 @@ contains(TEMPLATE, derived) {
-     fake_release.depends = first
-     QMAKE_EXTRA_TARGETS += fake_release
- 
--    # A lot of our code generators require GNU tools, readily available
--    # on Linux and Mac OS X. On Windows we do have a convenience copy in
--    # Qt5's top-level repository, so let's add that to the PATH if we can
--    # find it.
--    equals(QMAKE_HOST.os, Windows) {
--        GNUTOOLS_DIR=$$[QT_HOST_DATA]/../gnuwin32/bin
--        exists($$GNUTOOLS_DIR/gperf.exe) {
--            GNUTOOLS = "(set $$escape_expand(\\\")PATH=$$toSystemPath($$GNUTOOLS_DIR);%PATH%$$escape_expand(\\\"))"
--        }
--    }
--
-     for(generator, GENERATORS) {
-         eval($${generator}.CONFIG = target_predeps no_link)
-         eval($${generator}.dependency_type = TYPE_C)
-diff --git a/Tools/qmake/mkspecs/features/functions.prf b/Tools/qmake/mkspecs/features/functions.prf
-index 7b3ab01..eb143c6 100644
---- a/Tools/qmake/mkspecs/features/functions.prf
-+++ b/Tools/qmake/mkspecs/features/functions.prf
-@@ -202,9 +202,6 @@ defineTest(programExistsInPath) {
-     PATH = "$$(PATH)"
-     paths=$$split(PATH, $$QMAKE_DIRLIST_SEP)
- 
--    GNUTOOLS_DIR=$$[QT_HOST_DATA]/../gnuwin32/bin
--    exists($$GNUTOOLS_DIR): paths += $$GNUTOOLS_DIR
--
-     for(p, paths): exists($$p/$$program):return(true)
-     return(false)
- }
diff --git a/portage/libs/qt5/qtwebkit/qtwebkit.py b/portage/libs/qt5/qtwebkit/qtwebkit.py
index e17a977bc..0e36e809a 100644
--- a/portage/libs/qt5/qtwebkit/qtwebkit.py
+++ b/portage/libs/qt5/qtwebkit/qtwebkit.py
@@ -1,45 +1,37 @@
 # -*- coding: utf-8 -*-
 import info
 
 
 class subinfo(info.infoclass):
     def setTargets( self ):
         self.versionInfo.setDefaultValues( )
         for ver in self.versionInfo.tarballs():
             self.patchToApply[ ver ] = [("build-with-mysql.diff", 1)]
             
         for ver in self.versionInfo.branches():
             self.patchToApply[ ver ] = [("build-with-mysql.diff", 1)]
             
         for ver in self.versionInfo.tags():
             self.patchToApply[ ver ] = [("build-with-mysql.diff", 1)]
 
-        self.patchToApply[ "5.3" ] += [("qtwebkit-20130109.patch" , 1)]
-        self.patchToApply[ "5.3.0" ] += [("qtwebkit-20130109.patch" , 1)]
-        self.patchToApply[ "5.3.1" ] += [("qtwebkit-20130109.patch" , 1)]
-        self.patchToApply[ "v5.3.0" ] += [("qtwebkit-20130109.patch" , 1)]
-        self.patchToApply[ "v5.3.1" ] += [("qtwebkit-20130109.patch" , 1)]
-
-        self.patchToApply[ "5.4" ] += [("qtwebkit-5.4.patch" , 1)]
-
     def setDependencies( self ):
         self.dependencies['win32libs/sqlite'] = 'default'
         self.dependencies['win32libs/icu'] = 'default'
         self.dependencies['libs/qtbase'] = 'default'
         self.dependencies['libs/qtscript'] = 'default'
         self.dependencies['libs/qtdeclarative'] = 'default'
         self.dependencies['libs/qtmultimedia'] = 'default'
         self.dependencies['libs/qtwebchannel'] = 'default'
         self.buildDependencies['dev-util/ruby'] = 'default'
         self.buildDependencies['dev-util/winflexbison'] = 'default'
         self.buildDependencies['gnuwin32/gperf'] = 'default'
         
 
 from Package.Qt5CorePackageBase import *
 class Package( Qt5CorePackageBase ):
     def __init__( self, **args ):
         Qt5CorePackageBase.__init__( self )
         os.putenv("SQLITE3SRCDIR",EmergeStandardDirs.emergeRoot())
         if compiler.isMinGW():
             self.subinfo.options.configure.defines = """ "QMAKE_CXXFLAGS += -g0 -O3" """
 
diff --git a/portage/libs/qt5/version.ini b/portage/libs/qt5/version.ini
index 1f038e794..1ad33bb07 100644
--- a/portage/libs/qt5/version.ini
+++ b/portage/libs/qt5/version.ini
@@ -1,10 +1,10 @@
 [General]
 name=Qt5
-tags = v5.2.1;v5.3.0;v5.3.1;v5.4.0;v5.4.1
-branches = dev;5.3;5.4;5.5;5.6;5.7
-tarballs = 5.2.0;5.2.1;5.3.0;5.3.1;5.3.2;5.4.0;5.4.1;5.4.2;5.5.0;5.5.1
-defaulttarget  = 5.5
+tags = v5.6.1
+branches = dev;5.6;5.7
+tarballs = 5.6.1
+defaulttarget  = 5.6.1
 tarballUrl = http://download.qt-project.org/official_releases/qt/${VERSION_MAJOR}.${VERSION_MINOR}/${VERSION}/submodules/${PACKAGE_NAME}-opensource-src-${VERSION}.tar.xz
 tarballDigestUrl = http://download.qt-project.org/official_releases/qt/${VERSION_MAJOR}.${VERSION_MINOR}/${VERSION}/submodules/${PACKAGE_NAME}-opensource-src-${VERSION}.tar.xz.sha1
 tarballInstallSrc = ${PACKAGE_NAME}-opensource-src-${VERSION}
 gitUrl = [git]kde:qt/${PACKAGE_NAME}