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
@@ -209,16 +209,17 @@ menu "Graphics and Multimedia"
   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
diff --git a/packages b/packages
index fa18f9e..81ff596 100644
--- a/packages
+++ b/packages
@@ -112,17 +112,17 @@ CONFIG_MOBILEMSG	noncore/comm/mobilemsg	mobilemsg.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