1 files changed, 3 insertions, 4 deletions

diff --git a/packages b/packages
index 5aaef94..3f3e20f 100644
--- a/packages
+++ b/packages
@@ -42,7 +42,7 @@ CONFIG_FREETYPE	freetype	freetype.pro
         CONFIG_FRESH    noncore/styles/freshfresh.pro
         CONFIG_FTPLIB   noncore/net/ftplibftplib.pro
         CONFIG_GO       noncore/games/gogo.pro
-        CONFIG_GSMTOOL  noncore/comm/gsmtoolgsmtool.pro
+        CONFIG_GSMTOOL  noncore/unsupported/gsmtoolgsmtool.pro
         CONFIG_HANDWRITING      inputmethods/handwritinghandwriting.pro
         CONFIG_HELPBROWSER      core/apps/helpbrowserhelpbrowser.pro
         CONFIG_HOMEAPPLET       core/applets/homeapplethomeapplet.pro
@@ -63,7 +63,7 @@ CONFIG_LIBFFMPEG	core/multimedia/opieplayer/libffmpeg	libffmpeg.pro
         CONFIG_LIBFLASH         core/multimedia/opieplayer/libflashlibflash.pro
 CONFIG_LIBKATE  noncore/apps/tinykate/libkate libkate.pro
         CONFIG_LIBMAD   core/multimedia/opieplayer/libmadlibmad.pro
-        CONFIG_LIBMAIL  noncore/mail/libmaillibmail.pro
+        CONFIG_LIBMAIL  noncore/unsupported/mail2/libmaillibmail.pro
         CONFIG_LIBMPEG3         core/multimedia/opieplayer/libmpeg3libmpeg3.pro
         CONFIG_LIBOPIE  libopielibopie.pro
         CONFIG_LIBOPIE2CORE     libopie2/opiecoreopiecore.pro
@@ -84,7 +84,6 @@ CONFIG_LIGHT-AND-POWER	core/settings/light-and-power	light-and-power.pro
         CONFIG_LIQUID   noncore/styles/liquidliquid.pro
         CONFIG_LOGOUTAPPLET     core/applets/logoutappletlogoutapplet.pro
         CONFIG_MAILIT           noncore/net/mailit      mailit.pro
-        CONFIG_MAIL             noncore/net/mail        mail.pro
         CONFIG_MEDIUMMOUNT      noncore/settings/mediummountmediummount.pro
         CONFIG_MEMORYAPPLET     noncore/applets/memoryappletmemoryapplet.pro
         CONFIG_METAL    noncore/styles/metalmetal.pro
@@ -110,7 +109,7 @@ CONFIG_OPIE-WRITE	noncore/apps/opie-write	opie-write.pro
         CONFIG_OPIEALARMcore/opiealarm
         CONFIG_OPIEFTP  noncore/net/opieftpopieftp.pro
         CONFIG_OPIEIRC  noncore/net/opieircopieirc.pro
-        CONFIG_OPIEMAIL2noncore/mail mail.pro
+        CONFIG_OPIEMAIL2noncore/unsupported/mail2 mail.pro
         CONFIG_OPIEPLAYER       core/multimedia/opieplayeropieplayer.pro
         CONFIG_OPIEPLAYER2      noncore/multimedia/opieplayer2opieplayer2.pro
         CONFIG_OPIE-RDESKTOP    noncore/net/opierdesktopopierdesktop.pro