diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemopackagecontents.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemopackagecontents.cpp
index 1185eaf408b49e8a77cb3ce7bc2a1a29f03110de..957f7d0b9b14bcf5a3d18e7f7fd8ec2f398e7068 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemopackagecontents.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemopackagecontents.cpp
@@ -151,10 +151,12 @@ QVariantMap MaemoPackageContents::toMap() const
     QVariantMap map;
     map.insert(MODIFIED_KEY, m_modified);
     map.insert(REMOTE_EXE_KEY, m_remoteExecutableFilePath);
+
+    QDir dir;
     QStringList localFiles;
     QStringList remoteFiles;
     foreach (const Deployable &p, m_deployables) {
-        localFiles << p.localFilePath;
+        localFiles << dir.fromNativeSeparators(p.localFilePath);
         remoteFiles << p.remoteFilePath;
     }
     map.insert(LOCAL_FILES_KEY, localFiles);
@@ -170,9 +172,13 @@ void MaemoPackageContents::fromMap(const QVariantMap &map)
     const QStringList remoteFiles = map.value(REMOTE_FILES_KEY).toStringList();
     if (localFiles.count() != remoteFiles.count())
         qWarning("%s: serialized data inconsistent", Q_FUNC_INFO);
+
+    QDir dir;
     const int count = qMin(localFiles.count(), remoteFiles.count());
-    for (int i = 0; i < count; ++i)
-        m_deployables << Deployable(localFiles.at(i), remoteFiles.at(i));
+    for (int i = 0; i < count; ++i) {
+        m_deployables << Deployable(dir.toNativeSeparators(localFiles.at(i)),
+            remoteFiles.at(i));
+    }
 }
 
 QString MaemoPackageContents::remoteExecutableFilePath() const
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.cpp
index 109bd548e36ab618dba15a14f2ed54df284de11c..7e6bf7cc555ec026e0e8a510dccf38992eda0ed1 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.cpp
@@ -64,6 +64,7 @@ MaemoPackageCreationWidget::MaemoPackageCreationWidget(MaemoPackageCreationStep
       m_ui(new Ui::MaemoPackageCreationWidget)
 {
     m_ui->setupUi(this);
+    m_ui->packageContentsView->setWordWrap(false);
     m_ui->packageContentsView->setModel(step->packageContents());
     setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
     connect(step->packageContents(), SIGNAL(dataChanged(QModelIndex,QModelIndex)),
@@ -103,7 +104,8 @@ void MaemoPackageCreationWidget::addFile()
     if (localFile.isEmpty())
         return;
     const MaemoPackageContents::Deployable
-        deployable(QFileInfo(localFile).absoluteFilePath(), "/");
+        deployable(QDir::toNativeSeparators(QFileInfo(localFile).absoluteFilePath()),
+        "/");
     MaemoPackageContents * const contents = m_step->packageContents();
     if (!contents->addDeployable(deployable)) {
         QMessageBox::information(this, tr("File already in package"),