diff --git a/src/3rdparty/wayland/extensions/libhybris-egl-server-buffer.xml b/src/3rdparty/wayland/extensions/libhybris-egl-server-buffer.xml
new file mode 100644
index 00000000000..597ca0d7805
--- /dev/null
+++ b/src/3rdparty/wayland/extensions/libhybris-egl-server-buffer.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<protocol name="libhybris_egl_server_buffer">
+    <copyright>
+ Copyright (C) 2014 Jolla Ltd
+ Contact: http://www.qt-project.org/legal
+
+ 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 Digia Plc and its Subsidiary(-ies) 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_libhybris_buffer" version="1">
+    <event name="add_fd">
+      <arg name="fd" type="fd"/>
+    </event>
+  </interface>
+
+  <interface name="qt_libhybris_egl_server_buffer" version="1">
+  <!-- We depend on wayland-egl to authenticate for us -->
+    <enum name="format">
+      <entry name="RGBA32" value="0"/>
+    </enum>
+    <event name="server_buffer_created">
+      <arg name="id" type="new_id" interface="qt_libhybris_buffer"/>
+      <arg name="qid" type="new_id" interface="qt_server_buffer"/>
+      <arg name="num_fds" type="int" />
+      <arg name="ints" type="array" summary="an array of int32_t" />
+      <arg name="name" type="int"/>
+      <arg name="width" type="int"/>
+      <arg name="height" type="int"/>
+      <arg name="stride" type="int"/>
+      <arg name="format" type="int"/>
+    </event>
+  </interface>
+</protocol>
+
diff --git a/src/plugins/platforms/wayland/plugins/hardwareintegration/client.pro b/src/plugins/platforms/wayland/plugins/hardwareintegration/client.pro
index 1d79b2634d0..b7a9b46ee1d 100644
--- a/src/plugins/platforms/wayland/plugins/hardwareintegration/client.pro
+++ b/src/plugins/platforms/wayland/plugins/hardwareintegration/client.pro
@@ -17,3 +17,5 @@ config_xcomposite {
 config_drm_egl_server: \
     SUBDIRS += drm-egl-server
 
+config_libhybris_egl_server: \
+    SUBDIRS += libhybris-egl-server
diff --git a/src/plugins/platforms/wayland/plugins/hardwareintegration/libhybris-egl-server/libhybris-egl-server.json b/src/plugins/platforms/wayland/plugins/hardwareintegration/libhybris-egl-server/libhybris-egl-server.json
new file mode 100644
index 00000000000..3a1f4c08a6a
--- /dev/null
+++ b/src/plugins/platforms/wayland/plugins/hardwareintegration/libhybris-egl-server/libhybris-egl-server.json
@@ -0,0 +1,3 @@
+{
+    "Keys": [ "libhybris-egl-server" ]
+}
diff --git a/src/plugins/platforms/wayland/plugins/hardwareintegration/libhybris-egl-server/libhybris-egl-server.pro b/src/plugins/platforms/wayland/plugins/hardwareintegration/libhybris-egl-server/libhybris-egl-server.pro
new file mode 100644
index 00000000000..4d790970108
--- /dev/null
+++ b/src/plugins/platforms/wayland/plugins/hardwareintegration/libhybris-egl-server/libhybris-egl-server.pro
@@ -0,0 +1,14 @@
+PLUGIN_TYPE = wayland-graphics-integration/client
+load(qt_plugin)
+
+QT += waylandclient-private
+
+include(../../../../hardwareintegration/client/libhybris-egl-server/libhybris-egl-server.pri)
+
+LIBS += -lEGL
+
+OTHER_FILES += \
+    libhybris-egl-server.json
+
+SOURCES += main.cpp
+
diff --git a/src/plugins/platforms/wayland/plugins/hardwareintegration/libhybris-egl-server/main.cpp b/src/plugins/platforms/wayland/plugins/hardwareintegration/libhybris-egl-server/main.cpp
new file mode 100644
index 00000000000..9aee157903e
--- /dev/null
+++ b/src/plugins/platforms/wayland/plugins/hardwareintegration/libhybris-egl-server/main.cpp
@@ -0,0 +1,64 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Jolla Ltd, author: <giulio.camuffo@jollamobile.com>
+** Contact: http://www.qt-project.org/legal
+**
+** 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 Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/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 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtWaylandClient/private/qwaylandserverbufferintegrationplugin_p.h>
+#include "libhybriseglserverbufferintegration.h"
+
+QT_BEGIN_NAMESPACE
+
+class LibHybrisEglServerBufferPlugin : public QWaylandServerBufferIntegrationPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID QWaylandServerBufferIntegrationFactoryInterface_iid FILE "libhybris-egl-server.json")
+public:
+    QWaylandServerBufferIntegration *create(const QString&, const QStringList&);
+};
+
+QWaylandServerBufferIntegration *LibHybrisEglServerBufferPlugin::create(const QString& system, const QStringList& paramList)
+{
+    Q_UNUSED(paramList);
+    Q_UNUSED(system);
+    return new LibHybrisEglServerBufferIntegration();
+}
+
+QT_END_NAMESPACE
+
+#include "main.moc"