diff --git a/app/main.cpp b/app/main.cpp
index e567913c1..48f0022a4 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -35,7 +35,7 @@ static int runQtApplication(int argc, char* argv[], qtwebapp::LoggerWithFile *lo
 */
 	QCoreApplication::setOrganizationName("f4exb");
 	QCoreApplication::setApplicationName("SDRangel");
-	QCoreApplication::setApplicationVersion("4.0.4");
+	QCoreApplication::setApplicationVersion("4.0.5");
 
 #if 1
 	qApp->setStyle(QStyleFactory::create("fusion"));
diff --git a/appbench/main.cpp b/appbench/main.cpp
index 747f20d6c..81af55fab 100644
--- a/appbench/main.cpp
+++ b/appbench/main.cpp
@@ -57,7 +57,7 @@ static int runQtApplication(int argc, char* argv[], qtwebapp::LoggerWithFile *lo
 
     QCoreApplication::setOrganizationName("f4exb");
     QCoreApplication::setApplicationName("SDRangelBench");
-    QCoreApplication::setApplicationVersion("4.0.4");
+    QCoreApplication::setApplicationVersion("4.0.5");
 
     int catchSignals[] = {SIGQUIT, SIGINT, SIGTERM, SIGHUP};
     std::vector<int> vsig(catchSignals, catchSignals + sizeof(catchSignals) / sizeof(int));
diff --git a/appsrv/main.cpp b/appsrv/main.cpp
index 709724b99..2075db47a 100644
--- a/appsrv/main.cpp
+++ b/appsrv/main.cpp
@@ -56,7 +56,7 @@ static int runQtApplication(int argc, char* argv[], qtwebapp::LoggerWithFile *lo
 
     QCoreApplication::setOrganizationName("f4exb");
     QCoreApplication::setApplicationName("SDRangelSrv");
-    QCoreApplication::setApplicationVersion("4.0.4");
+    QCoreApplication::setApplicationVersion("4.0.5");
 
     int catchSignals[] = {SIGQUIT, SIGINT, SIGTERM, SIGHUP};
     std::vector<int> vsig(catchSignals, catchSignals + sizeof(catchSignals) / sizeof(int));
diff --git a/debian/changelog b/debian/changelog
index 88db0bb1b..2e1ec031f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+sdrangel (4.0.5-1) unstable; urgency=medium
+
+  * Web API: handle pre-flight requests
+
+ -- Edouard Griffiths, F4EXB <f4exb06@gmail.com>  Sun, 22 Jul 2018 09:14:18 +0200
+  
 sdrangel (4.0.4-1) unstable; urgency=medium
 
   * Fixed PlutoSDR output sample width. Fixes issue #198
diff --git a/sdrbase/webapi/webapirequestmapper.cpp b/sdrbase/webapi/webapirequestmapper.cpp
index 758ed1fe7..c1bc2c7ef 100644
--- a/sdrbase/webapi/webapirequestmapper.cpp
+++ b/sdrbase/webapi/webapirequestmapper.cpp
@@ -76,6 +76,17 @@ void WebAPIRequestMapper::service(qtwebapp::HttpRequest& request, qtwebapp::Http
     {
         QByteArray path=request.getPath();
 
+        // Handle pre-flight requests
+        if (request.getMethod() == "OPTIONS")
+        {
+            qDebug("WebAPIRequestMapper::service: method OPTIONS: assume pre-flight");
+            response.setHeader("Access-Control-Allow-Origin", "*");
+            response.setHeader("Access-Control-Allow-Headers", "*");
+            response.setHeader("Access-Control-Allow-Methods", "*");
+            response.setStatus(200, "OK");
+            return;
+        }
+
         if (path == WebAPIAdapterInterface::instanceSummaryURL) {
             instanceSummaryService(request, response);
         } else if (path == WebAPIAdapterInterface::instanceDevicesURL) {