diff --git a/common/server_response_containers.h b/common/server_response_containers.h
index 9220cdac..afad1a1e 100644
--- a/common/server_response_containers.h
+++ b/common/server_response_containers.h
@@ -2,6 +2,7 @@
 #define SERVER_RESPONSE_CONTAINERS_H
 
 #include <QPair>
+#include <QList>
 #include "pb/server_message.pb.h"
 
 namespace google { namespace protobuf { class Message; } }
diff --git a/oracle/CMakeLists.txt b/oracle/CMakeLists.txt
index fddfe774..12dc6406 100644
--- a/oracle/CMakeLists.txt
+++ b/oracle/CMakeLists.txt
@@ -36,6 +36,13 @@ if(Qt5Widgets_FOUND)
     include_directories(${Qt5Widgets_INCLUDE_DIRS})
     list(APPEND ORACLE_LIBS Widgets)
 
+    # QtConcurrent
+    find_package(Qt5Concurrent)
+    if(Qt5Concurrent_FOUND)
+        include_directories(${Qt5Concurrent_INCLUDE_DIRS})
+        list(APPEND ORACLE_LIBS Concurrent)
+    endif()
+
     # QtNetwork
     find_package(Qt5Network)
     if(Qt5Network_FOUND)
diff --git a/oracle/src/main.cpp b/oracle/src/main.cpp
index 44b900f3..d2fb708d 100644
--- a/oracle/src/main.cpp
+++ b/oracle/src/main.cpp
@@ -8,9 +8,12 @@ SettingsCache *settingsCache;
 int main(int argc, char *argv[])
 {
 	QApplication app(argc, argv);
-	
+
+#if QT_VERSION < 0x050000
+	// gone in Qt5, all source files _MUST_ be utf8-encoded
 	QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8"));
-	
+#endif
+
 	QCoreApplication::setOrganizationName("Cockatrice");
 	QCoreApplication::setOrganizationDomain("cockatrice");
 	// this can't be changed, as it influences the default savepath for cards.xml
diff --git a/oracle/src/oraclewizard.cpp b/oracle/src/oraclewizard.cpp
index 75381b1d..4f0e102a 100644
--- a/oracle/src/oraclewizard.cpp
+++ b/oracle/src/oraclewizard.cpp
@@ -1,8 +1,25 @@
 #include <QtGui>
+#if QT_VERSION < 0x050000
+    #include <QDesktopServices>
+#else 
+    #include <QStandardPaths>
+#endif
+#include <QAbstractButton>
+#include <QtConcurrent>
+#include <QCheckBox>
+#include <QFileDialog>
 #include <QGridLayout>
-#include <QDesktopServices>
+#include <QLabel>
+#include <QLineEdit>
+#include <QMessageBox>
 #include <QNetworkAccessManager>
 #include <QNetworkReply>
+#include <QProgressBar>
+#include <QPushButton>
+#include <QRadioButton>
+#include <QScrollArea>
+#include <QScrollBar>
+#include <QTextEdit>
 
 #include "oraclewizard.h"
 #include "oracleimporter.h"
@@ -13,7 +30,14 @@ OracleWizard::OracleWizard(QWidget *parent)
     : QWizard(parent)
 {
     settings = new QSettings(this);
-    importer = new OracleImporter(QDesktopServices::storageLocation(QDesktopServices::DataLocation), this);
+
+    importer = new OracleImporter(
+#if QT_VERSION < 0x050000
+        QDesktopServices::storageLocation(QDesktopServices::DataLocation)
+#else
+        QStandardPaths::standardLocations(QStandardPaths::DataLocation).first()
+#endif
+    , this);
 
     addPage(new IntroPage);
     addPage(new LoadSetsPage);
@@ -372,7 +396,12 @@ void SaveSetsPage::updateTotalProgress(int cardsImported, int setIndex, const QS
 bool SaveSetsPage::validatePage()
 {
     bool ok = false;
-    const QString dataDir = QDesktopServices::storageLocation(QDesktopServices::DataLocation);
+    const QString dataDir = 
+#if QT_VERSION < 0x050000
+        QDesktopServices::storageLocation(QDesktopServices::DataLocation);
+#else
+        QStandardPaths::standardLocations(QStandardPaths::DataLocation).first();
+#endif
     QDir dir(dataDir);
     if (!dir.exists())
         dir.mkpath(dataDir);