diff --git a/main.cpp b/main.cpp
index 99b11d0..6c686ac 100644
--- a/main.cpp
+++ b/main.cpp
@@ -148,6 +148,7 @@ int main(int argc, char *argv[])
     context->setContextProperty( "keyLoader", &keyLoader );
 
     view.setSource(QUrl("qrc:/qml/Main.qml"));
+    view.setResizeMode(QQuickView::SizeRootObjectToView);
 
     QObject *root = view.rootObject();
     if(!root)
diff --git a/qml/Main.qml b/qml/Main.qml
index 7d8a4dd..88da26c 100644
--- a/qml/Main.qml
+++ b/qml/Main.qml
@@ -20,24 +20,48 @@
 import QtQuick 2.0
 import TextRender 1.0
 import QtQuick.Window 2.0
-import com.nokia.meego 2.0
 
-PageStackWindow {
-    id: pageStackWindow
-
-    focus: true
-
-    Keys.onPressed: {
-        term.keyPress(event.key,event.modifiers,event.text);
-    }
+Item {
+    id: root
 
     property string windowTitle: util.currentWindowTitle();
 
-    initialPage:Page {
+    Item {
         id: page
-        anchors.fill: parent
 
-        orientationLock: window.getOrientationLockMode()
+        property bool forceOrientation
+        property int forcedOrientation
+        property bool portrait: rotation % 180 == 0
+
+        width: portrait ? root.width : root.height
+        height: portrait ? root.height : root.width
+        anchors.centerIn: parent
+        rotation: Screen.angleBetween((forceOrientation ? forcedOrientation : Screen.orientation),
+                                      Screen.primaryOrientation)
+        focus: true
+        Keys.onPressed: {
+            term.keyPress(event.key,event.modifiers,event.text);
+        }
+
+        Component.onCompleted: {
+            var stringMode = util.settingsValue("ui/orientationLockMode");
+            applyOrientationLock(stringMode)
+        }
+
+        function applyOrientationLock(stringMode) {
+            switch (stringMode) {
+            case "auto":
+                page.forceOrientation = false
+                break
+            case "landscape":
+                page.forceOrientation = true
+                page.forcedOrientation = Qt.LandscapeOrientation
+                break
+            case "portrait":
+                page.forceOrientation = true
+                page.forcedOrientation = Qt.PortraitOrientation
+            }
+        }
 
         Rectangle {
         property string fgcolor: "black"
@@ -46,7 +70,7 @@ PageStackWindow {
 
         property int fadeOutTime: 80
         property int fadeInTime: 350
-        property real pixelRatio: pageStackWindow.width / 540
+        property real pixelRatio: root.width / 540
 
         // layout constants
         property int buttonWidthSmall: 60*pixelRatio
@@ -463,27 +487,10 @@ PageStackWindow {
                 util.allowGestures = true;
         }
 
-        function lockModeStringToQtEnum(stringMode) {
-            switch (stringMode) {
-            case "auto":
-                return PageOrientation.Automatic
-            case "landscape":
-                return PageOrientation.LockLandscape
-            case "portrait":
-                return PageOrientation.LockPortrait
-            }
-        }
-
-        function getOrientationLockMode()
-        {
-            var stringMode = util.settingsValue("ui/orientationLockMode");
-            page.orientationLock = lockModeStringToQtEnum(stringMode)
-        }
-
         function setOrientationLockMode(stringMode)
         {
             util.setSettingsValue("ui/orientationLockMode", stringMode);
-            page.orientationLock = lockModeStringToQtEnum(stringMode)
+            page.applyOrientationLock(stringMode)
         }
     }
     }
diff --git a/rpm/fingerterm.spec b/rpm/fingerterm.spec
index 33de744..515da79 100644
--- a/rpm/fingerterm.spec
+++ b/rpm/fingerterm.spec
@@ -15,7 +15,6 @@ BuildRequires: pkgconfig(Qt0Feedback)
 BuildRequires: pkgconfig(nemonotifications-qt5) >= 1.0.4
 Requires: qt5-qtdeclarative-import-xmllistmodel
 Requires: qt5-qtdeclarative-import-window2
-Requires: qt-components-qt5
 Obsoletes: meego-terminal <= 0.2.2
 Provides: meego-terminal > 0.2.2