diff --git a/mkspecs/devices/linux-imx6-g++/qeglfshooks_imx6.cpp b/mkspecs/devices/linux-imx6-g++/qeglfshooks_imx6.cpp
new file mode 100644
index 0000000000..e51f6cfcfb
--- /dev/null
+++ b/mkspecs/devices/linux-imx6-g++/qeglfshooks_imx6.cpp
@@ -0,0 +1,92 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the qmake spec of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qeglfshooks.h"
+#include <EGL/eglvivante.h>
+
+QT_BEGIN_NAMESPACE
+
+class QEglFSImx6Hooks : public QEglFSHooks
+{
+public:
+    QEglFSImx6Hooks();
+    virtual QSize screenSize() const;
+    virtual EGLNativeWindowType createNativeWindow(const QSize &size, const QSurfaceFormat &format);
+    virtual void destroyNativeWindow(EGLNativeWindowType window);
+
+private:
+    QSize mScreenSize;
+    EGLNativeDisplayType mNativeDisplay;
+};
+
+
+QEglFSImx6Hooks::QEglFSImx6Hooks()
+{
+    int width, height;
+    mNativeDisplay = fbGetDisplay();
+    fbGetDisplayGeometry(mNativeDisplay, &width, &height);
+    mScreenSize.setHeight(height);
+    mScreenSize.setWidth(width);
+}
+
+QSize QEglFSImx6Hooks::screenSize() const
+{
+    return mScreenSize;
+}
+
+EGLNativeWindowType QEglFSImx6Hooks::createNativeWindow(const QSize &size, const QSurfaceFormat &format)
+{
+    Q_UNUSED(format);
+
+    EGLNativeWindowType eglWindow = fbCreateWindow(mNativeDisplay, 0, 1, size.width(), size.height());
+    return eglWindow;
+}
+
+
+void QEglFSImx6Hooks::destroyNativeWindow(EGLNativeWindowType window)
+{
+    fbDestroyWindow(window);
+}
+
+QEglFSImx6Hooks eglFSImx6Hooks;
+QEglFSHooks *platformHooks = &eglFSImx6Hooks;
+
+QT_END_NAMESPACE
diff --git a/mkspecs/devices/linux-imx6-g++/qmake.conf b/mkspecs/devices/linux-imx6-g++/qmake.conf
new file mode 100644
index 0000000000..870037261a
--- /dev/null
+++ b/mkspecs/devices/linux-imx6-g++/qmake.conf
@@ -0,0 +1,46 @@
+#
+# qmake configuration for the Freescale iMX6 boards (single, dual and quad)
+#
+# This mkspec is based and tested on the ltib-source-release 3.0.15
+# Building ltib including glib, gpu-drivers and what ever you want to use (e.g. dbus or fontconfig)
+# This mkspec is for the fb-version (eglfs), and not for x11
+# A typical configure line looks like:
+# /home/tsenyk/qt5/qt5/configure -opensource -confirm-license -make libs -device imx6 \
+# -device-option CROSS_COMPILE=/opt/freescale/usr/local/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/arm-fsl-linux-gnueabi- \
+# -device-option ROOTFS=<path-to-your-ltib-install>/rootfs \
+# -prefix /usr/local/Trolltech/Qt5-imx6-1
+#
+# NOTE:  currently ltib doesn't produce a proper staging/sysroot-filessystem.
+#        If one sets -sysroot <path-to-rootfs>, the toolchain doesn't find basic binaries (e.g. crt1.o),
+#        therefore we can't use -sysroot for this device.
+#        The solution for this platform is to use a seperate device-option instead of sysroot:
+#           -device-option ROOTFS=<path-to-ltib-install>/rootfs
+
+include(../common/linux_device_pre.conf)
+
+EGLFS_PLATFORM_HOOKS_SOURCES = $$PWD/qeglfshooks_imx6.cpp
+
+QMAKE_INCDIR            = $${ROOTFS}/usr/include \
+                          $${ROOTFS}/usr/include/dbus-1.0 \
+                          $${ROOTFS}/usr/lib/dbus-1.0/include \
+                          $${ROOTFS}/usr/include/freetype2
+QMAKE_INCDIR_OPENGL_ES2 = $${ROOTFS}/usr/include/GLES2
+
+
+### LIBS
+QMAKE_LIBDIR            = $${ROOTFS}/usr/lib
+
+QMAKE_LIBS_EGL          = -lEGL
+QMAKE_LIBS_OPENGL_ES2   = -lGLESv2 -lEGL -lGAL
+QMAKE_LIBS_OPENVG       = -lOpenVG -lEGL -lGAL
+
+
+### additional FLAGS
+QMAKE_LFLAGS            += -Wl,-rpath-link,$${ROOTFS}/usr/lib
+
+QMAKE_CFLAGS_RELEASE    = -O2 -march=armv7-a -mfpu=neon -DLINUX=1 -DEGL_API_FB=1
+QMAKE_CXXFLAGS_RELEASE  = $$QMAKE_CFLAGS_RELEASE
+
+include(../common/linux_device_post.conf)
+
+load(qt_config)
diff --git a/mkspecs/devices/linux-imx6-g++/qplatformdefs.h b/mkspecs/devices/linux-imx6-g++/qplatformdefs.h
new file mode 100644
index 0000000000..9e6b0f5bcc
--- /dev/null
+++ b/mkspecs/devices/linux-imx6-g++/qplatformdefs.h
@@ -0,0 +1,42 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the qmake spec of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "../../linux-g++/qplatformdefs.h"