diff --git a/ChangeLog b/ChangeLog
index 1ba35e0ea..96d6e2549 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -31,6 +31,7 @@
 19. Add option to provide a list of genres which should use composer, and not
     album-artist, to group albums.
 20. Fix updating of composer tag.
+21. Fix build with proxy config and Qt5
 
 1.5.2
 -----
diff --git a/network/networkproxyfactory.cpp b/network/networkproxyfactory.cpp
index b878eff3d..9830ae965 100644
--- a/network/networkproxyfactory.cpp
+++ b/network/networkproxyfactory.cpp
@@ -122,6 +122,15 @@ static QList<QNetworkProxy> systemProxyForQuery(const QNetworkProxyQuery &query)
 }
 #endif
 
+static QList<QNetworkProxy> getSystemProxyForQuery(const QNetworkProxyQuery &query)
+{
+    #if defined Q_OS_LINUX && QT_VERSION < 0x050000
+    return ::systemProxyForQuery(query);
+    #else
+    return QNetworkProxyFactory::systemProxyForQuery(query);
+    #endif
+}
+
 #ifdef ENABLE_PROXY_CONFIG
 NetworkProxyFactory::NetworkProxyFactory()
     : mode(Mode_System)
@@ -173,7 +182,7 @@ QList<QNetworkProxy> NetworkProxyFactory::queryProxy(const QNetworkProxyQuery& q
 
     switch (mode) {
     case Mode_System:
-        return ::systemProxyForQuery(query);
+        return getSystemProxyForQuery(query);
     case Mode_Direct:
         ret.setType(QNetworkProxy::NoProxy);
         break;
@@ -191,9 +200,7 @@ QList<QNetworkProxy> NetworkProxyFactory::queryProxy(const QNetworkProxyQuery& q
     }
 
     return QList<QNetworkProxy>() << ret;
-    #elif defined Q_OS_LINUX && QT_VERSION < 0x050000
-    return ::systemProxyForQuery(query);
-    #else
-    return QNetworkProxyFactory::systemProxyForQuery(query);
+    #elif
+    return getSystemProxyForQuery(query);
     #endif
 }