diff --git a/src/libtomahawk/tomahawksettings.cpp b/src/libtomahawk/tomahawksettings.cpp
index 1e56956fe..0d13763a5 100644
--- a/src/libtomahawk/tomahawksettings.cpp
+++ b/src/libtomahawk/tomahawksettings.cpp
@@ -284,12 +284,27 @@ TomahawkSettings::setProxyType( const int type )
 }
 
 
+bool
+TomahawkSettings::proxyDns() const
+{
+    return value( "network/proxy/dns", false ).toBool();
+}
+
+
+void
+TomahawkSettings::setProxyDns( bool lookupViaProxy )
+{
+    setValue( "network/proxy/dns", lookupViaProxy );
+}
+
+
 QStringList
 TomahawkSettings::aclEntries() const
 {
     return value( "acl/entries", QStringList() ).toStringList();
 }
 
+
 void
 TomahawkSettings::setAclEntries( const QStringList &entries )
 {
diff --git a/src/libtomahawk/tomahawksettings.h b/src/libtomahawk/tomahawksettings.h
index 366355bb4..64365199d 100644
--- a/src/libtomahawk/tomahawksettings.h
+++ b/src/libtomahawk/tomahawksettings.h
@@ -119,6 +119,9 @@ public:
     int proxyType() const;
     void setProxyType( const int type );
 
+    bool proxyDns() const;
+    void setProxyDns( bool lookupViaProxy );
+
     /// ACL settings
     QStringList aclEntries() const;
     void setAclEntries( const QStringList &entries );
diff --git a/src/libtomahawk/utils/tomahawkutils.cpp b/src/libtomahawk/utils/tomahawkutils.cpp
index 7d456c72b..6344c2fe3 100644
--- a/src/libtomahawk/utils/tomahawkutils.cpp
+++ b/src/libtomahawk/utils/tomahawkutils.cpp
@@ -17,6 +17,7 @@
  */
 
 #include "tomahawkutils.h"
+#include <tomahawksettings.h>
 
 #include <QCoreApplication>
 #include <QColor>
@@ -371,6 +372,9 @@ void
 setProxy( QNetworkProxy* proxy )
 {
     s_proxy = proxy;
+    qDebug() << Q_FUNC_INFO << " setting proxy to use proxy DNS? " << (TomahawkSettings::instance()->proxyDns() ? "true" : "false");
+    if ( !TomahawkSettings::instance()->proxyDns() )
+        s_proxy->setCapabilities( QNetworkProxy::TunnelingCapability | QNetworkProxy::ListeningCapability | QNetworkProxy::UdpTunnelingCapability );
 }