diff --git a/share/qtcreator/templates/html5app/html5applicationviewer/html5applicationviewer.h b/share/qtcreator/templates/html5app/html5applicationviewer/html5applicationviewer.h
index 66902da24f2..0a6939e7622 100644
--- a/share/qtcreator/templates/html5app/html5applicationviewer/html5applicationviewer.h
+++ b/share/qtcreator/templates/html5app/html5applicationviewer/html5applicationviewer.h
@@ -31,7 +31,9 @@ public:
     void loadFile(const QString &fileName);
     void loadUrl(const QUrl &url);
 
+    // Note that this will only have an effect on Symbian and Fremantle.
     void setOrientation(ScreenOrientation orientation);
+
     void showExpanded();
 
     QGraphicsWebView *webView() const;
diff --git a/share/qtcreator/templates/mobileapp/mainwindow.h b/share/qtcreator/templates/mobileapp/mainwindow.h
index eb446748ecc..8f0ae8a4f76 100644
--- a/share/qtcreator/templates/mobileapp/mainwindow.h
+++ b/share/qtcreator/templates/mobileapp/mainwindow.h
@@ -20,7 +20,9 @@ public:
     explicit MainWindow(QWidget *parent = 0);
     virtual ~MainWindow();
 
+    // Note that this will only have an effect on Symbian and Fremantle.
     void setOrientation(ScreenOrientation orientation);
+
     void showExpanded();
 
 private:
diff --git a/share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.h b/share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.h
index a3174282f93..f4d7f40cd9d 100644
--- a/share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.h
+++ b/share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.h
@@ -28,7 +28,10 @@ public:
 
     void setMainQmlFile(const QString &file);
     void addImportPath(const QString &path);
+
+    // Note that this will only have an effect on Symbian and Fremantle.
     void setOrientation(ScreenOrientation orientation);
+
     void showExpanded();
 
 private:
diff --git a/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp b/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp
index d7b9a22f5a8..4a7932b2e0e 100644
--- a/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp
@@ -94,14 +94,17 @@ int AbstractMobileAppWizardDialog::nextId() const
     const bool symbianTargetSelected =
         m_targetsPage->isTargetSelected(QLatin1String(Constants::S60_EMULATOR_TARGET_ID))
         || m_targetsPage->isTargetSelected(QLatin1String(Constants::S60_DEVICE_TARGET_ID));
-    const bool maemoTargetSelected =
-        m_targetsPage->isTargetSelected(QLatin1String(Constants::MAEMO5_DEVICE_TARGET_ID))
+    const bool fremantleTargetSelected
+        = m_targetsPage->isTargetSelected(QLatin1String(Constants::MAEMO5_DEVICE_TARGET_ID));
+    const bool maemoTargetSelected = fremantleTargetSelected
             || m_targetsPage->isTargetSelected(QLatin1String(Constants::HARMATTAN_DEVICE_TARGET_ID))
             || m_targetsPage->isTargetSelected(QLatin1String(Constants::MEEGO_DEVICE_TARGET_ID));
 
     if (currentPage() == m_targetsPage) {
-        if (symbianTargetSelected || maemoTargetSelected)
+        if (symbianTargetSelected || fremantleTargetSelected)
             return m_genericOptionsPageId;
+        else if (maemoTargetSelected)
+            return m_maemoOptionsPageId;
         else
             return idOfNextGenericPage();
     } else if (currentPage() == m_genericOptionsPage) {
@@ -122,7 +125,7 @@ int AbstractMobileAppWizardDialog::nextId() const
 void AbstractMobileAppWizardDialog::initializePage(int id)
 {
     if (id == startId()) {
-        m_targetItem->setNextItems(QList<Utils::WizardProgressItem *>() << m_genericItem << itemOfNextGenericPage());
+        m_targetItem->setNextItems(QList<Utils::WizardProgressItem *>() << m_genericItem << m_maemoItem << itemOfNextGenericPage());
         m_genericItem->setNextItems(QList<Utils::WizardProgressItem *>() << m_symbianItem << m_maemoItem);
         m_symbianItem->setNextItems(QList<Utils::WizardProgressItem *>() << m_maemoItem << itemOfNextGenericPage());
     } else if (id == m_genericOptionsPageId) {