diff --git a/src/3rdparty/wayland/extensions/qt-dmabuf-server-buffer.xml b/src/3rdparty/wayland/extensions/qt-dmabuf-server-buffer.xml
new file mode 100644
index 00000000000..6b1d426fc07
--- /dev/null
+++ b/src/3rdparty/wayland/extensions/qt-dmabuf-server-buffer.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<protocol name="qt_dmabuf_server_buffer">
+    <copyright>
+ Copyright (C) 2018 The Qt Company Ltd.
+ Contact: http://www.qt.io/licensing/
+
+ This file is part of the plugins of the Qt Toolkit.
+
+ $QT_BEGIN_LICENSE:BSD$
+ You may use this file under the terms of the BSD license as follows:
+
+ "Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+   * Redistributions of source code must retain the above copyright
+     notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above copyright
+     notice, this list of conditions and the following disclaimer in
+     the documentation and/or other materials provided with the
+     distribution.
+   * Neither the name of The Qt Company Ltd nor the names of its
+     contributors may be used to endorse or promote products derived
+     from this software without specific prior written permission.
+
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+
+ $QT_END_LICENSE$
+    </copyright>
+  <interface name="qt_dmabuf_server_buffer" version="1">
+    <description summary="internal protocol for buffer sharing">
+      This protocol is used internally by Qt for implementing the
+      qt_server_buffer extension on hardware that supports Linux dma-buf.
+
+      This protocol is not part of the Qt API.  It exists purely as an
+      implementation detail and may change from version to
+      version without notice, or even be removed.
+    </description>
+    <event name="server_buffer_created">
+      <arg name="id" type="new_id" interface="qt_server_buffer"/>
+      <arg name="fd" type="fd"/>
+      <arg name="width" type="int"/>
+      <arg name="height" type="int"/>
+      <arg name="stride" type="int"/>
+      <arg name="offset" type="int"/>
+      <arg name="fourcc_format" type="int"/>
+    </event>
+  </interface>
+</protocol>
+
diff --git a/src/plugins/platforms/wayland/configure.json b/src/plugins/platforms/wayland/configure.json
index ef5e87bb7e5..1f86a49360f 100644
--- a/src/plugins/platforms/wayland/configure.json
+++ b/src/plugins/platforms/wayland/configure.json
@@ -68,6 +68,12 @@
             "type": "compile",
             "test": "libhybris_egl_server",
             "use": "egl"
+        },
+        "dmabuf-server-buffer": {
+            "label": "Linux dma-buf Buffer Sharing",
+            "type": "compile",
+            "test": "dmabuf_server_buffer",
+            "use": "egl"
         }
     },
 
@@ -111,6 +117,11 @@
             "condition": "features.wayland-client && features.opengl && features.egl && tests.libhybris-egl-server",
             "output": [ "privateFeature" ]
         },
+        "wayland-dmabuf-server-buffer": {
+            "label": "Linux dma-buf server buffer integration",
+            "condition": "features.wayland-client && features.opengl && features.egl && tests.dmabuf-server-buffer",
+            "output": [ "privateFeature" ]
+        },
         "wayland-shm-emulation-server-buffer": {
             "label": "Shm emulation server buffer integration",
             "condition": "features.wayland-client && features.opengl",
diff --git a/src/plugins/platforms/wayland/plugins/hardwareintegration/client.pro b/src/plugins/platforms/wayland/plugins/hardwareintegration/client.pro
index eab62f8d08e..82e431ee869 100644
--- a/src/plugins/platforms/wayland/plugins/hardwareintegration/client.pro
+++ b/src/plugins/platforms/wayland/plugins/hardwareintegration/client.pro
@@ -16,3 +16,5 @@ qtConfig(wayland-libhybris-egl-server-buffer): \
     SUBDIRS += libhybris-egl-server
 qtConfig(wayland-shm-emulation-server-buffer): \
     SUBDIRS += shm-emulation-server
+qtConfig(wayland-dmabuf-server-buffer): \
+    SUBDIRS += dmabuf-server
diff --git a/src/plugins/platforms/wayland/plugins/hardwareintegration/dmabuf-server/dmabuf-server.json b/src/plugins/platforms/wayland/plugins/hardwareintegration/dmabuf-server/dmabuf-server.json
new file mode 100644
index 00000000000..22272a4abe9
--- /dev/null
+++ b/src/plugins/platforms/wayland/plugins/hardwareintegration/dmabuf-server/dmabuf-server.json
@@ -0,0 +1,3 @@
+{
+    "Keys": [ "dmabuf-server" ]
+}
diff --git a/src/plugins/platforms/wayland/plugins/hardwareintegration/dmabuf-server/dmabuf-server.pro b/src/plugins/platforms/wayland/plugins/hardwareintegration/dmabuf-server/dmabuf-server.pro
new file mode 100644
index 00000000000..5925c8b04f1
--- /dev/null
+++ b/src/plugins/platforms/wayland/plugins/hardwareintegration/dmabuf-server/dmabuf-server.pro
@@ -0,0 +1,15 @@
+# We have a bunch of C code with casts, so we can't have this option
+QMAKE_CXXFLAGS_WARN_ON -= -Wcast-qual
+
+QT += waylandclient-private
+
+include(../../../../hardwareintegration/client/dmabuf-server/dmabuf-server.pri)
+
+OTHER_FILES += \
+    dmabuf-server.json
+
+SOURCES += main.cpp
+
+PLUGIN_TYPE = wayland-graphics-integration-client
+PLUGIN_CLASS_NAME = DmaBufServerBufferPlugin
+load(qt_plugin)
diff --git a/src/plugins/platforms/wayland/plugins/hardwareintegration/dmabuf-server/main.cpp b/src/plugins/platforms/wayland/plugins/hardwareintegration/dmabuf-server/main.cpp
new file mode 100644
index 00000000000..d4955d458f1
--- /dev/null
+++ b/src/plugins/platforms/wayland/plugins/hardwareintegration/dmabuf-server/main.cpp
@@ -0,0 +1,64 @@
+/****************************************************************************
+**
+** Copyright (C) 2018 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the plugins of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtWaylandClient/private/qwaylandserverbufferintegrationplugin_p.h>
+#include "dmabufserverbufferintegration.h"
+
+QT_BEGIN_NAMESPACE
+
+namespace QtWaylandClient {
+
+class DmaBufServerBufferPlugin : public QWaylandServerBufferIntegrationPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID QWaylandServerBufferIntegrationFactoryInterface_iid FILE "dmabuf-server.json")
+public:
+    QWaylandServerBufferIntegration *create(const QString&, const QStringList&) override;
+};
+
+QWaylandServerBufferIntegration *DmaBufServerBufferPlugin::create(const QString&, const QStringList&)
+{
+    return new DmaBufServerBufferIntegration();
+}
+
+}
+
+QT_END_NAMESPACE
+
+#include "main.moc"
diff --git a/src/plugins/platforms/wayland/plugins/hardwareintegration/wayland-egl/main.cpp b/src/plugins/platforms/wayland/plugins/hardwareintegration/wayland-egl/main.cpp
index 05053ff950d..0890635536f 100644
--- a/src/plugins/platforms/wayland/plugins/hardwareintegration/wayland-egl/main.cpp
+++ b/src/plugins/platforms/wayland/plugins/hardwareintegration/wayland-egl/main.cpp
@@ -52,10 +52,8 @@ public:
     QWaylandClientBufferIntegration *create(const QString&, const QStringList&) override;
 };
 
-QWaylandClientBufferIntegration *QWaylandEglClientBufferPlugin::create(const QString& system, const QStringList& paramList)
+QWaylandClientBufferIntegration *QWaylandEglClientBufferPlugin::create(const QString&, const QStringList&)
 {
-    Q_UNUSED(paramList);
-    Q_UNUSED(system);
     return new QWaylandEglClientBufferIntegration();
 }