2 files changed, 2 insertions, 1 deletions
diff --git a/config.in b/config.in
index c75576a..2cd3160 100644
--- a/config.in
+++ b/config.in
@@ -185,64 +185,65 @@ comment ""
 menu "Applets"
  source core/applets/config.in
  source noncore/applets/config.in
 endmenu
 menu "Apps"
  source core/apps/config.in
  source noncore/apps/config.in
 endmenu
 menu "Communications and Networking"
  source noncore/comm/config.in
  source noncore/net/config.in
 endmenu
 menu "Games"
  source noncore/games/config.in
 endmenu
 menu "Graphics and Multimedia"
  source freetype/config.in
  source noncore/graphics/config.in
  source core/multimedia/config.in
  source noncore/multimedia/config.in
 endmenu
 menu "Input methods"
  source inputmethods/config.in
 endmenu
 menu "Pim"
+  source core/obex/config.in
  source core/pim/config.in
  comment "Today Plugins ---"
    source noncore/todayplugins/config.in
    source core/pim/today/plugins/config.in
 endmenu
 menu "Settings"
  source core/settings/config.in
  source noncore/settings/config.in
 endmenu
 menu "Theming"
  comment "Decorations ---"
  source noncore/decorations/config.in
  comment "Styles ---"
  source noncore/styles/config.in
 endmenu
 menu "Tools"
  source noncore/tools/config.in
 endmenu
 menu "Development"
  source development/keyview/config.in
  #source development/debugviewer/config.in
 endmenu
 menu "Examples"
    config EXAMPLES
        boolean "Compile Example Application"
    source examples/config.in
 endmenu
diff --git a/packages b/packages
index fa18f9e..81ff596 100644
--- a/packages
+++ b/packages
@@ -88,65 +88,65 @@ CONFIG_LIBOPIE2UI	libopie2/opieui	opieui.pro
        CONFIG_LIBOPIE  libopielibopie.pro
        CONFIG_LIBOPIE_PIM      libopie/pimpim.pro
        CONFIG_LIBOPIETOOTH     noncore/net/opietooth/liblib.pro
        CONFIG_LIBQPE   librarylibrary.pro
        CONFIG_LIBQPE-X11       x11/libqpe-x11libqpe-x11.pro
 CONFIG_LIBQRSYNC    rsync   rsync.pro
        CONFIG_LIBQTAUX         libqtauxlibqtaux.pro
        CONFIG_LIBSLCOMPAT      libslcompatlibslcompat.pro
        CONFIG_LIBSQL   libsqllibsql.pro
 CONFIG_LIBTREMOR core/multimedia/opieplayer/vorbis/tremor tremor.pro
 CONFIG_LIBTREMORPLUGIN core/multimedia/opieplayer/vorbis libtremor.pro
        CONFIG_LIGHT-AND-POWER  core/settings/light-and-powerlight-and-power.pro
        CONFIG_LIQUID   noncore/styles/liquidliquid.pro
        CONFIG_LOGOUTAPPLET     core/applets/logoutappletlogoutapplet.pro
        CONFIG_MAIL3            noncore/net/mail        mail.pro
 CONFIG_MAILAPPLET     noncore/net/mail/taskbarapplet  taskbarapplet.pro
        CONFIG_MAILIT           noncore/unsupported/mailit      mailit.pro
 CONFIG_MAIN_TAB_EXAMPLE examples/main-tab       example.pro
        CONFIG_MEDIUMMOUNT      noncore/settings/mediummountmediummount.pro
        CONFIG_MEMORYAPPLET     noncore/applets/memoryappletmemoryapplet.pro
        CONFIG_METAL    noncore/styles/metalmetal.pro
        CONFIG_MINDBREAKER      noncore/games/mindbreakermindbreaker.pro
        CONFIG_MINESWEEP        noncore/games/minesweepminesweep.pro
        CONFIG_MOBILEMSG        noncore/comm/mobilemsgmobilemsg.pro
        CONFIG_MODPLUG  core/multimedia/opieplayer/modplugmodplug.pro
        CONFIG_MULTIKEYAPPLET core/applets/multikeyappletmultikeyapplet.pro
        CONFIG_MULTIKEY         inputmethods/multikeymultikey.pro
        CONFIG_NETSYSTEMTIME    noncore/settings/netsystemtimenetsystemtime.pro
        CONFIG_NETWORKAPPLET    noncore/applets/networkappletnetworkapplet.pro
        CONFIG_NETWORKSETUP     noncore/settings/networksettingsnetworksettings.pro
        CONFIG_NOTESAPPLET      noncore/applets/notesappletnotesapplet.pro
        CONFIG_OAPP     core/apps/oappoapp.pro
-        CONFIG_OBEX     core/applets/obex2obex.pro
+        CONFIG_OBEX     core/obexobex.pro
        CONFIG_ODICT    noncore/apps/odictodict.pro
        CONFIG_OIPKG    noncore/unsupported/oipkgoipkg.pro
        CONFIG_OPIEALARM        core/opiealarmopiealarm.pro
        CONFIG_OPIE-CONSOLE     noncore/apps/opie-consoleopie-console.pro
        CONFIG_OPIE_EYE         noncore/graphics/opie-eyephunk_view.pro
        CONFIG_OPIE_EYE_SLAVE   noncore/graphics/opie-eye/slaveslave.pro
        CONFIG_OPIEFTP  noncore/net/opieftpopieftp.pro
        CONFIG_OPIEIRC  noncore/net/opieircopieirc.pro
        CONFIG_OPIE-LOGIN       core/opie-loginopie-login.pro
        CONFIG_OPIEMAIL2noncore/unsupported/mail2 mail.pro
        CONFIG_OPIEPLAYER2      noncore/multimedia/opieplayer2opieplayer2.pro
        CONFIG_OPIEPLAYER       core/multimedia/opieplayeropieplayer.pro
        CONFIG_OPIE-RDESKTOP    noncore/net/opierdesktopopierdesktop.pro
        CONFIG_OPIE-READER      noncore/apps/opie-readeropie-reader.pro
        CONFIG_OPIEREC          noncore/multimedia/opierecopierec.pro
        CONFIG_OPIE-SHEET       noncore/apps/opie-sheetopie-sheet.pro
        CONFIG_OPIE-SH  noncore/tools/opie-shopie-sh.pro
        CONFIG_OPIETOOTH-APPLET         noncore/net/opietooth/appletapplet.pro
        CONFIG_OPIETOOTH-MANAGER        noncore/net/opietooth/managermanager.pro
        CONFIG_OPIE-WRITE       noncore/apps/opie-writeopie-write.pro
        CONFIG_OSEARCH  core/pim/osearchosearch.pro
        CONFIG_OXYGEN   noncore/apps/oxygenoxygen.pro
        CONFIG_PACKAGEMANAGER   noncore/settings/packagemanagerpackagemanager.pro
        CONFIG_PARASHOOT        noncore/games/parashootparashoot.pro
        CONFIG_PICKBOARD        inputmethods/pickboardpickboard.pro
        CONFIG_POWERCHORD       noncore/multimedia/powerchordpowerchord.pro
 CONFIG_PPP      noncore/settings/networksettings/ppp    ppp.pro
        CONFIG_PYQUICKLAUNCH-APPLET     noncore/applets/pyquicklaunchpyquicklaunch.pro
        CONFIG_PYQUICKLAUNCHER  noncore/tools/pyquicklauncherpyquicklauncher.pro
        CONFIG_PYTHON-EXAMPLESexamples/python bla.pro
        CONFIG_QASHMONEY        noncore/apps/qashmoneyqashmoney.pro
        CONFIG_QASTEROIDS       noncore/games/qasteroidsqasteroids.pro