diff --git a/share/qtcreator/templates/qt4project/main.cpp b/share/qtcreator/templates/qt4project/main.cpp
index e1e39f6f26dde95712ac8b6c8587992da5cbf0ae..cc7344515fc4ef7dcff57b40e2d25a93f75aa5b1 100644
--- a/share/qtcreator/templates/qt4project/main.cpp
+++ b/share/qtcreator/templates/qt4project/main.cpp
@@ -5,6 +5,10 @@ int main(int argc, char *argv[])
 {
     QApplication a(argc, argv);
     %CLASS% w;
+#if defined(Q_WS_S60) || defined(Q_WS_MAEMO_5)
+    w.showMaximized();
+#else
     w.show();
+#endif
     return a.exec();
 }
diff --git a/share/qtcreator/templates/qt4project/widget.ui b/share/qtcreator/templates/qt4project/widget.ui
index a804f2044eb4fa69dd5833134fcf3a29e9f5cba3..2ac9f1d7c700e40df3727e1ecb734a8c2a37d90e 100644
--- a/share/qtcreator/templates/qt4project/widget.ui
+++ b/share/qtcreator/templates/qt4project/widget.ui
@@ -5,8 +5,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>600</width>
-    <height>400</height>
+    <width>%WIDGET_WIDTH%</width>
+    <height>%WIDGET_HEIGHT%</height>
    </rect>
   </property>
   <property name="windowTitle" >
diff --git a/src/plugins/qt4projectmanager/wizards/guiappwizard.cpp b/src/plugins/qt4projectmanager/wizards/guiappwizard.cpp
index 87448e069728c7a246b1a9624209633d62a4992e..d5cc9c34f0a8982733d6c02a1b3a6d26fbf62857 100644
--- a/src/plugins/qt4projectmanager/wizards/guiappwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/guiappwizard.cpp
@@ -208,6 +208,8 @@ bool GuiAppWizard::parametrizeTemplate(const QString &templatePath, const QStrin
     contents.replace(QLatin1String("%INCLUDE%"), params.headerFileName);
     contents.replace(QLatin1String("%CLASS%"), params.className);
     contents.replace(QLatin1String("%BASECLASS%"), params.baseClassName);
+    contents.replace(QLatin1String("%WIDGET_HEIGHT%"), QString::number(params.widgetHeight));
+    contents.replace(QLatin1String("%WIDGET_WIDTH%"), QString::number(params.widgetWidth));
 
     const QChar dot = QLatin1Char('.');
 
diff --git a/src/plugins/qt4projectmanager/wizards/guiappwizarddialog.cpp b/src/plugins/qt4projectmanager/wizards/guiappwizarddialog.cpp
index 942fe9862f8bc8828d07b0c1bd0605c8bbb2b38e..05375ec95d5699d8a04a3b0d995074531e2ebff2 100644
--- a/src/plugins/qt4projectmanager/wizards/guiappwizarddialog.cpp
+++ b/src/plugins/qt4projectmanager/wizards/guiappwizarddialog.cpp
@@ -30,8 +30,11 @@
 #include "guiappwizarddialog.h"
 
 #include "filespage.h"
+#include "qt4target.h"
 #include "qtprojectparameters.h"
 
+#include <QtCore/QSet>
+
 namespace Qt4ProjectManager {
 namespace Internal {
 
@@ -104,6 +107,19 @@ GuiAppParameters GuiAppWizardDialog::parameters() const
     rc.headerFileName = m_filesPage->headerFileName();
     rc.formFileName = m_filesPage->formFileName();
     rc.designerForm =  m_filesPage->formInputChecked();
+    QSet<QString> targets = selectedTargets();
+    if (targets.contains(QLatin1String(MAEMO_DEVICE_TARGET_ID)) ||
+        targets.contains(QLatin1String(MAEMO_EMULATOR_TARGET_ID))) {
+        rc.widgetWidth = 800;
+        rc.widgetHeight = 480;
+    } else if (targets.contains(QLatin1String(S60_DEVICE_TARGET_ID)) ||
+               targets.contains(QLatin1String(S60_EMULATOR_TARGET_ID))) {
+        rc.widgetWidth = 360;
+        rc.widgetHeight = 640;
+    } else {
+        rc.widgetWidth = 400;
+        rc.widgetHeight = 300;
+    }
     return rc;
 }
 
diff --git a/src/plugins/qt4projectmanager/wizards/guiappwizarddialog.h b/src/plugins/qt4projectmanager/wizards/guiappwizarddialog.h
index 204dcf26458f8e9a9bf87562fe5b5f6e74334407..d4f65c1a965accaf6ecf8c067e631af1b3b3f380 100644
--- a/src/plugins/qt4projectmanager/wizards/guiappwizarddialog.h
+++ b/src/plugins/qt4projectmanager/wizards/guiappwizarddialog.h
@@ -47,6 +47,8 @@ struct GuiAppParameters
     QString sourceFileName;
     QString headerFileName;
     QString formFileName;
+    int widgetWidth;
+    int widgetHeight;
     bool designerForm;
 };