--- a/qtmobility/src/systeminfo/systeminfo.pro	Fri Apr 16 15:51:22 2010 +0300
+++ b/qtmobility/src/systeminfo/systeminfo.pro	Mon May 03 13:18:40 2010 +0300
@@ -42,11 +42,11 @@
 
 unix: {
     QT += gui
-    maemo*|linux-*: {
+    maemo5|maemo6|linux-*: {
         SOURCES += qsysteminfo_linux_common.cpp
         HEADERS += qsysteminfo_linux_common_p.h
     }
-    !maemo*:linux-*: {
+    !maemo5:!maemo6:linux-*: {
         SOURCES += qsysteminfo_linux.cpp
         HEADERS += qsysteminfo_linux_p.h
         contains(QT_CONFIG,dbus): {
@@ -63,7 +63,7 @@
            DEFINES += QT_NO_NETWORKMANAGER
         }
     }
-    maemo*: {
+    maemo5|maemo6: {
             #Qt GConf wrapper added here until a proper place is found for it.
             CONFIG += link_pkgconfig
             SOURCES += qsysteminfo_maemo.cpp gconfitem.cpp