85 files changed, 92 insertions, 93 deletions

diff --git a/core/apps/embeddedkonsole/opie-embeddedkonsole.control b/core/apps/embeddedkonsole/opie-embeddedkonsole.control
index b72c1fc..95d28bf 100644
--- a/core/apps/embeddedkonsole/opie-embeddedkonsole.control
+++ b/core/apps/embeddedkonsole/opie-embeddedkonsole.control
@@ -1,10 +1,10 @@
 Package: opie-embeddedkonsole
-Files: bin/embeddedkonsole apps/Applications/embeddedkonsole.desktop pics/konsole
+Files: plugins/application/libembeddedkonsole.so* bin/embeddedkonsole apps/Applications/embeddedkonsole.desktop pics/konsole
 Priority: optional
 Section: opie/applications
 Maintainer: L.J. Potter <ljp@llornkcor.com>
 Architecture: arm
 Depends: task-opie-minimal, libopie1, opie-keytabs
 Description: KDE's konsole (shell terminal)
  Ported to the Opie environment.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/apps/helpbrowser/opie-helpbrowser.control b/core/apps/helpbrowser/opie-helpbrowser.control
index 4312979..7729c2b 100644
--- a/core/apps/helpbrowser/opie-helpbrowser.control
+++ b/core/apps/helpbrowser/opie-helpbrowser.control
@@ -1,11 +1,11 @@
 Package: opie-helpbrowser
-Files: bin/helpbrowser apps/Applications/helpbrowser.desktop docs pics/helpbrowser
+Files: plugins/application/libhelpbrowser.so* bin/helpbrowser apps/Applications/helpbrowser.desktop docs pics/helpbrowser
 Priority: optional
 Section: opie/applications
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
 Arch: iPAQ
 Depends: task-opie-minimal
 Description: Browse HTML help documents
  The HTML help browser for the Opie environment.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/apps/textedit/opie-textedit.control b/core/apps/textedit/opie-textedit.control
index 5ec205b..1e72316 100644
--- a/core/apps/textedit/opie-textedit.control
+++ b/core/apps/textedit/opie-textedit.control
@@ -1,10 +1,10 @@
 Package: opie-textedit
-Files: bin/textedit apps/1Pim/textedit.desktop pics/textedit
+Files: plugins/application/libtextedit.so* bin/textedit apps/1Pim/textedit.desktop pics/textedit
 Priority: optional
 Section: opie/applications
 Maintainer: L. J. Potter <llornkcor@handhelds.org>
 Architecture: arm
 Depends: task-opie-minimal, libopie1
 Description: Text Editor
  The text editor for the Opie environment.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/multimedia/opieplayer/opie-mediaplayer.control b/core/multimedia/opieplayer/opie-mediaplayer.control
index 97e9f88..63c4fd7 100644
--- a/core/multimedia/opieplayer/opie-mediaplayer.control
+++ b/core/multimedia/opieplayer/opie-mediaplayer.control
@@ -1,10 +1,10 @@
 Package: opie-mediaplayer
-Files: bin/opieplayer pics/opieplayer apps/Applications/opieplayer.desktop
+Files: plugins/application/libopieplayer.so* bin/opieplayer pics/opieplayer apps/Applications/opieplayer.desktop
 Priority: optional
 Section: opie/applications
 Maintainer: L.J.Potter <ljp@llornkcor.com>
 Architecture: arm
 Depends: task-opie-minimal, libopie1, opie-mediaplayer2-skin-default | opie-mediaplayer2-skin-default-landscape
 Description: The Opie media player
- The mediaplayer for Opie. It plays mp3, mpeg, and wav.
+ The mediaplayer for Opie. It plays mp3, mpeg, mod and wav.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/pim/addressbook/opie-addressbook.control b/core/pim/addressbook/opie-addressbook.control
index d949bd4..29740e4 100644
--- a/core/pim/addressbook/opie-addressbook.control
+++ b/core/pim/addressbook/opie-addressbook.control
@@ -1,11 +1,11 @@
 Package: opie-addressbook
-Files: bin/addressbook apps/1Pim/addressbook.desktop
+Files: plugins/application/libaddressbook.so* bin/addressbook apps/1Pim/addressbook.desktop
 Priority: optional
 Section: opie/applications
 Conflicts: qpe-tkcaddressbook
 Maintainer: Stefan Eilers <eilers.stefan@epost.de>
 Architecture: arm
 Depends: task-opie-minimal, libopie1, opie-pics
 Description: Contacts
  A simple addressbook for the Opie environment.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/pim/datebook/opie-datebook.control b/core/pim/datebook/opie-datebook.control
index fe5a086..4fe9abf 100644
--- a/core/pim/datebook/opie-datebook.control
+++ b/core/pim/datebook/opie-datebook.control
@@ -1,11 +1,11 @@
 Package: opie-datebook
-Files: bin/datebook apps/1Pim/datebook.desktop
+Files: plugins/application/libdatebook.so* bin/datebook apps/1Pim/datebook.desktop
 Priority: optional
 Section: opie/applications
 Conflicts: qpe-tkccalendar
-Maintainer: Warwick Allison <warwick@trolltech.com>
+Maintainer: Holger 'Zecke' Freyther <zecke@handhelds.org>
 Architecture: arm
 Depends: task-opie-minimal, libopie1, opie-pics
 Description: A datebook/appointment manager
  A datebook/appointment manager for the Opie environment.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/pim/osearch/opie-osearch.control b/core/pim/osearch/opie-osearch.control
index ef209de..738a9b7 100644
--- a/core/pim/osearch/opie-osearch.control
+++ b/core/pim/osearch/opie-osearch.control
@@ -1,10 +1,9 @@
 Package: opie-osearch
-Files: bin/osearch apps/1Pim/osearch.desktop pics/osearch/*.png
+Files: plugins/application/libosearch.so* bin/osearch apps/1Pim/osearch.desktop pics/osearch/*.png
 Priority: optional
-Section: opie/
+Section: opie/applications
 Maintainer: Patrick S. Vogt <tille@handhelds.org>
 Architecture: arm
 Depends: task-opie-minimal
-Description: search...
-
+Description: Search through all PIM data
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/pim/today/opie-today.control b/core/pim/today/opie-today.control
index 70f7738..aab4db9 100644
--- a/core/pim/today/opie-today.control
+++ b/core/pim/today/opie-today.control
@@ -1,14 +1,14 @@
 Package: opie-today
-Files: bin/today apps/1Pim/today.desktop pics/today/*
+Files: plugins/application/libtoday.so* bin/today apps/1Pim/today.desktop pics/today/*
 Priority: optional
 Section: opie/applications
 Maintainer: Maximilian Reiß <harlekin@handhelds.org>
 Architecture: arm
 Version: $QPE_VERSION$EXTRAVERSION
 Depends: task-opie-minimal, libopie1
 License: GPL
 Description: today screen
  This today screen app gives an overview of appointments 
  and todos.
  It also shows incoming and outgoing mails from opiemail.
  When using Opie (opie.handhelds.org) today can be autostarted
diff --git a/core/pim/todo/opie-todo.control b/core/pim/todo/opie-todo.control
index 17a65a8..86f9b7a 100644
--- a/core/pim/todo/opie-todo.control
+++ b/core/pim/todo/opie-todo.control
@@ -1,10 +1,10 @@
 Package: opie-todo
-Files: bin/todolist apps/1Pim/todo.desktop
+Files: plugins/application/libtodolist.so* bin/todolist apps/1Pim/todo.desktop
 Priority: optional
 Section: opie/applications
 Maintainer: Holger 'zecke' Freyther <zecke@handhelds.org>
 Architecture: arm
 Depends: task-opie-minimal, libopie1, opie-pics
 Description: TODO-list manager
  A Todo-list manager for the Opie environment.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/settings/button/opie-button-settings.control b/core/settings/button/opie-button-settings.control
index 34dc7e0..93b084c 100644
--- a/core/settings/button/opie-button-settings.control
+++ b/core/settings/button/opie-button-settings.control
@@ -1,10 +1,10 @@
 Package: opie-button-settings
-Files: bin/buttonsettings apps/Settings/Button.desktop pics/buttonsettings/*.png
+Files: plugins/application/libbuttonsettings.so* bin/buttonsettings apps/Settings/Button.desktop pics/buttonsettings/*.png
 Priority: optional
 Section: opie/settings
 Maintainer: Robert Griebl <sandman@handhelds.org>
 Architecture: arm
 Depends: task-opie-minimal
 Description: Device-buttons settings dialog
  For the Opie environment.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/settings/citytime/opie-citytime.control b/core/settings/citytime/opie-citytime.control
index 5b0c8da..5f3f33c 100644
--- a/core/settings/citytime/opie-citytime.control
+++ b/core/settings/citytime/opie-citytime.control
@@ -1,10 +1,10 @@
 Package: opie-citytime
-Files: bin/citytime apps/Settings/citytime.desktop pics/citytime
+Files: plugins/application/libcitytime.so* bin/citytime apps/Settings/citytime.desktop pics/citytime
 Priority: optional
 Section: opie/settings
 Maintainer: Maximilian Reiss <harlekin@handhelds.org>
 Architecture: arm
 Depends: task-opie-minimal, timezones
 Description: Time-zone / world clock settings
  The time-zone manager for the Opie environment.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/settings/launcher/opie-launcher-settings.control b/core/settings/launcher/opie-launcher-settings.control
index 0e7832d..58596e8 100644
--- a/core/settings/launcher/opie-launcher-settings.control
+++ b/core/settings/launcher/opie-launcher-settings.control
@@ -1,10 +1,10 @@
 Package: opie-launcher-settings
-Files: bin/launchersettings apps/Settings/Launcher.desktop pics/launchersettings
+Files: plugins/application/liblaunchersettings.so* bin/launchersettings apps/Settings/Launcher.desktop pics/launchersettings
 Priority: optional
 Section: opie/settings
 Maintainer: Robert Griebl <sandman@handhelds.org>
 Architecture: arm
 Depends: task-opie-minimal
 Description: Launcher settings dialog
  For the Opie environment.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/settings/light-and-power/opie-light-and-power.control b/core/settings/light-and-power/opie-light-and-power.control
index da6fc4f..eaa47f3 100644
--- a/core/settings/light-and-power/opie-light-and-power.control
+++ b/core/settings/light-and-power/opie-light-and-power.control
@@ -1,10 +1,10 @@
 Package: opie-light-and-power
-Files: bin/light-and-power apps/Settings/Light.desktop pics/lightandpower
+Files: plugins/application/liblight-and-power.so* bin/light-and-power apps/Settings/Light.desktop pics/lightandpower
 Priority: optional
 Section: opie/settings
 Maintainer: Maximilian Reiss <harlekin@handhelds.org>
 Architecture: arm
 Depends: task-opie-minimal
 Description: Light and Power settings dialog
  For the Opie environment.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/settings/security/opie-security.control b/core/settings/security/opie-security.control
index 0da6f0f..6059e90 100644
--- a/core/settings/security/opie-security.control
+++ b/core/settings/security/opie-security.control
@@ -1,10 +1,10 @@
 Package: opie-security
-Files: bin/security apps/Settings/Security.desktop pics/security
+Files: plugins/application/libsecurity.so* bin/security apps/Settings/Security.desktop pics/security
 Priority: optional
 Section: opie/settings
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
 Depends: task-opie-minimal
 Description: Security settings dialog
  For the Opie environment.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/tools/quicklauncher/qpe-quicklauncher.control b/core/tools/quicklauncher/qpe-quicklauncher.control
index f07a7d5..b1bab53 100644
--- a/core/tools/quicklauncher/qpe-quicklauncher.control
+++ b/core/tools/quicklauncher/qpe-quicklauncher.control
@@ -1,10 +1,10 @@
 Files: bin/quicklauncher
 Priority: required
 Section: qpe/system
 Maintainer: Trolltech (www.trolltech.com)
 Architecture: $CPU_ARCH
 Arch: $DEVICE_ARCH
-Version: $QPE_VERSION-12
-Depends: qpe-libqtopia qpe-pim
+Version: $QPE_VERSION$EXTRAVERSION
+Depends:
 Description: Quick launcher stub
  Launcher stub for quick launch enabled applications.
diff --git a/library/task-opie-minimal.control b/library/task-opie-minimal.control
index 155bd9a..f59ee27 100644
--- a/library/task-opie-minimal.control
+++ b/library/task-opie-minimal.control
@@ -1,13 +1,13 @@
 Package: task-opie-minimal
 Files: 
 Priority: required
 Section: opie/system
 Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm
-Depends: libqte2 (>=$QTE_VERSION), qte-fonts (>=$QTE_VERSION), opie-common, libqpe1, libopie1, opie-qcop, opie-sounds, apmd, opie-pics, timezones, opie-aqpkg, opie-taskbar, opie-opiealarm, opie-login 
+Depends: libqte2 (>=$QTE_VERSION), qte-fonts (>=$QTE_VERSION), opie-common, libqpe1, libopie1, opie-qcop, opie-sounds, apmd, opie-pics, timezones, opie-aqpkg, opie-quicklauncher, opie-taskbar, opie-opiealarm, opie-login 
 Provides: opie-base, qpe-base
 Replaces: opie-base, qpe-base
 Description: Bootstrap Opie environment(minimal)
  A complete GUI environment for handhelds. This is the _minimal_ version.
  You will probably want to install one of the opie-i18n-* packages.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/apps/advancedfm/opie-advancedfm.control b/noncore/apps/advancedfm/opie-advancedfm.control
index 1e0f9ec..d675d6a 100644
--- a/noncore/apps/advancedfm/opie-advancedfm.control
+++ b/noncore/apps/advancedfm/opie-advancedfm.control
@@ -1,10 +1,10 @@
 Package: opie-advancedfm
-Files: bin/advancedfm apps/Applications/advancedfm.desktop pics/advancedfm
+Files: plugins/application/libadvancedfm.so* bin/advancedfm apps/Applications/advancedfm.desktop pics/advancedfm
 Priority: optional
 Section: opie/applications
 Maintainer: L.J. Potter <ljp@llornkcor.com> 
 Architecture: arm
 Depends: task-opie-minimal
 Description: Advanced File Manager
  The advanced file manager for the Opie environment.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/apps/checkbook/opie-checkbook.control b/noncore/apps/checkbook/opie-checkbook.control
index 78f303c..58e0076 100644
--- a/noncore/apps/checkbook/opie-checkbook.control
+++ b/noncore/apps/checkbook/opie-checkbook.control
@@ -1,10 +1,10 @@
 Package: opie-checkbook
-Files: bin/checkbook apps/Applications/checkbook.desktop pics/checkbook
+Files: plugins/application/libcheckbook.so* bin/checkbook apps/Applications/checkbook.desktop pics/checkbook
 Priority: optional
 Section: applications
 Maintainer: Dan Williams <drw@handhelds.org>
 Architecture: arm
 Depends: task-opie-minimal, libopie1
 Description: Checkbook keeping program.
  The checkbook accounting program for the Opie environment.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/apps/odict/opie-odict.control b/noncore/apps/odict/opie-odict.control
index f684716..bfc6d72 100644
--- a/noncore/apps/odict/opie-odict.control
+++ b/noncore/apps/odict/opie-odict.control
@@ -1,10 +1,10 @@
 Package: opie-odict
-Files: bin/odict apps/Applications/odict.desktop pics/odict/odict.png
+Files: plugins/application/libodict.so* bin/odict apps/Applications/odict.desktop pics/odict/odict.png
 Priority: optional
 Section: applications
 Maintainer: Carsten Niehaus <cniehaus@handhelds.org>
 Architecture: arm
 Depends: task-opie-minimal
 Description: Dictionarylookupprogram
  Look up words :)
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/apps/opie-console/opie-console.control b/noncore/apps/opie-console/opie-console.control
index 852451d..3934fa1 100644
--- a/noncore/apps/opie-console/opie-console.control
+++ b/noncore/apps/opie-console/opie-console.control
@@ -1,11 +1,11 @@
 Package: opie-console
-Files: bin/opie-console apps/Applications/opie-console.desktop pics/console/* 
+Files: plugins/application/libopie-console.so* bin/opie-console apps/Applications/opie-console.desktop pics/console/* 
 Priority: optional
 Section: opie/applications
 Maintainer: Opie team <opie@handhelds.org>
 Architecture: arm
 Version: 0.6-$SUB_VERSION
 Depends: qpe-base, libopie1, opie-console-help-en, lrzsz, opie-keytabs
 License: GPL
 Description: Opie terminal app
  
diff --git a/noncore/apps/opie-reader/opie-reader.control b/noncore/apps/opie-reader/opie-reader.control
index b7b0e8f..eab3ef0 100644
--- a/noncore/apps/opie-reader/opie-reader.control
+++ b/noncore/apps/opie-reader/opie-reader.control
@@ -1,10 +1,10 @@
 Package: opie-reader
-Files: bin/reader apps/Applications/opie-reader.desktop pics/opie-reader/*
+Files: plugins/application/libreader.so* bin/reader apps/Applications/opie-reader.desktop pics/opie-reader/*
 Priority: optional
 Section: applications
 Maintainer: Tim Wentford <timwentford@hotmail.com>
 Architecture: arm
 Depends: task-opie-minimal
 License: GPL
 Description: E-Book reader
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/apps/opie-sheet/opie-sheet.control b/noncore/apps/opie-sheet/opie-sheet.control
index 795ee70..006ddf3 100644
--- a/noncore/apps/opie-sheet/opie-sheet.control
+++ b/noncore/apps/opie-sheet/opie-sheet.control
@@ -1,11 +1,11 @@
 Package: opie-sheet
-Files: bin/sheetqt apps/Applications/opie-sheet.desktop help/en/html/sheetqt.html pics/opie-sheet/sheetqt.png
+Files: plugins/application/libsheetqt.so* bin/sheetqt apps/Applications/opie-sheet.desktop help/en/html/sheetqt.html pics/opie-sheet/sheetqt.png
 Priority: optional
 Section: opie/applications
 Maintainer: Serdar Ozler <sozler@sitebest.com>
 Architecture: arm
 Version: 1.0.2
 Depends: task-opie-minimal
 License: Public Domain
 Description: Opie Sheet
  Spreadsheet software for Opie.
diff --git a/noncore/apps/opie-write/opie-write.control b/noncore/apps/opie-write/opie-write.control
index 7b37671..880c2a8 100644
--- a/noncore/apps/opie-write/opie-write.control
+++ b/noncore/apps/opie-write/opie-write.control
@@ -1,10 +1,10 @@
 Package: opie-write
-Files: bin/opie-write apps/Applications/opie-write.desktop pics/opie-write
+Files: plugins/application/libopie-write.so* bin/opie-write apps/Applications/opie-write.desktop pics/opie-write
 Priority: optional
 Section: opie/applications
 Maintainer: L.J. Potter <ljp@llornkcor.com> 
 Architecture: arm
 Depends: task-opie-minimal
 Description: Rich Text Editor 
  The rich text editor for the Opie environment.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/apps/oxygen/opie-oxygen.control b/noncore/apps/oxygen/opie-oxygen.control
index 6d40d1b..6f3c832 100644
--- a/noncore/apps/oxygen/opie-oxygen.control
+++ b/noncore/apps/oxygen/opie-oxygen.control
@@ -1,10 +1,10 @@
 Package: opie-oxygen
-Files: bin/oxygen apps/Applications/oxygen.desktop pics/oxygen/oxygen.png share/oxygen/*
+Files: plugins/application/liboxygen.so* bin/oxygen apps/Applications/oxygen.desktop pics/oxygen/oxygen.png share/oxygen/*
 Priority: optional
 Section: applications
 Maintainer: Carsten Niehaus <cniehaus@handhelds.org>
 Architecture: arm
 Depends: task-opie-minimal
 Description: Periodic System of the Elements 
  The chemistry application for the Opie-environment
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/apps/tableviewer/opie-tableviewer.control b/noncore/apps/tableviewer/opie-tableviewer.control
index aba9b8d..2842590 100644
--- a/noncore/apps/tableviewer/opie-tableviewer.control
+++ b/noncore/apps/tableviewer/opie-tableviewer.control
@@ -1,11 +1,11 @@
 Package: opie-tableviewer
-Files: bin/tableviewer apps/Applications/tableviewer.desktop
+Files: plugins/application/libtableviewer.so* bin/tableviewer apps/Applications/tableviewer.desktop
 Priority: optional
 Section: opie/applications
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
 Arch: iPAQ
 Depends: task-opie-minimal
 Description: XML database browsers
  A table/database viewer for the Opie environment.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/apps/tinykate/opie-tinykate.control b/noncore/apps/tinykate/opie-tinykate.control
index 731375c..1fde467 100644
--- a/noncore/apps/tinykate/opie-tinykate.control
+++ b/noncore/apps/tinykate/opie-tinykate.control
@@ -1,9 +1,9 @@
 Package: opie-tinykate
-Files: bin/tinykate apps/Applications/tinykate.desktop pics/tinykate $OPIEDIR/lib/libtinykate.so.1.0.0 $OPIEDIR/lib/libtinykate.so.1.0 $OPIEDIR/lib/libtinykate.so.1
+Files: plugins/application/libtinykate.so* bin/tinykate apps/Applications/tinykate.desktop pics/tinykate $OPIEDIR/lib/libtinykate.so.1.0.0 $OPIEDIR/lib/libtinykate.so.1.0 $OPIEDIR/lib/libtinykate.so.1
 Priority: optional
 Section: opie/applications
 Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm
 Depends: task-opie-minimal
 Description: Kate for opie
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/comm/keypebble/opie-keypebble.control b/noncore/comm/keypebble/opie-keypebble.control
index 23e4e89..74fd227 100644
--- a/noncore/comm/keypebble/opie-keypebble.control
+++ b/noncore/comm/keypebble/opie-keypebble.control
@@ -1,11 +1,11 @@
 Package: opie-keypebble
-Files: bin/keypebble apps/Applications/keypebble.desktop pics/vnc
+Files: plugins/application/libkeypebble.so* bin/keypebble apps/Applications/keypebble.desktop pics/vnc
 Priority: optional
 Section: opie/applications
 Maintainer: Martin Imobersteg <imm@gmx.ch>
 Architecture: arm
 Arch: iPAQ
 Depends: task-opie-minimal
 Description: VNC Viewer
  Virtual Network Computing (VNC) viewer
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/comm/mobilemsg/opie-mobilemsg.control b/noncore/comm/mobilemsg/opie-mobilemsg.control
index 98ac72e..8a177ce 100644
--- a/noncore/comm/mobilemsg/opie-mobilemsg.control
+++ b/noncore/comm/mobilemsg/opie-mobilemsg.control
@@ -1,10 +1,10 @@
 Package: opie-mobilemsg
-Files: bin/mobilemsg apps/Applications/mobilemsg.desktop pics/mobilemsg 
+Files: plugins/application/libmobilemsg.so* bin/mobilemsg apps/Applications/mobilemsg.desktop pics/mobilemsg 
 Priority: optional
 Section: opie/comm
 Maintainer: Bruno Rodrigues <bruno.rodrigues@litux.org>
 Architecture: arm
 Depends: task-opie-minimal
 Description: Mobile Messaging
  For the Opie environment.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/games/backgammon/backgammon.control b/noncore/games/backgammon/backgammon.control
index 6468181..d78b547 100644
--- a/noncore/games/backgammon/backgammon.control
+++ b/noncore/games/backgammon/backgammon.control
@@ -1,10 +1,10 @@
 Package: backgammon
-Files: bin/backgammon apps/Games/backgammon.desktop pics/backgammon help/en/html/backgammon.html
+Files: plugins/application/libbackgammon.so* bin/backgammon apps/Games/backgammon.desktop pics/backgammon help/en/html/backgammon.html
 Priority: optional
 Section: opie/games
 Maintainer: Ralf Waspe <rwaspe@web.de>
 Architecture: arm
 Depends: task-opie-minimal
 Description: Backgammon Game
  A Backgammon game for the Opie environment.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/games/bounce/opie-bounce.control b/noncore/games/bounce/opie-bounce.control
index 8b3fdb9..bfe85d3 100644
--- a/noncore/games/bounce/opie-bounce.control
+++ b/noncore/games/bounce/opie-bounce.control
@@ -1,11 +1,11 @@
 Package: opie-bounce
-Files: bin/bounce apps/Games/bounce.desktop pics/bounce/*.png
+Files: plugins/application/libbounce.so* bin/bounce apps/Games/bounce.desktop pics/bounce/*.png
 Version: 0.6-$SUB_VERSION 
 Depends: task-opie-minimal
 Priority: optional
 Section: opie/games
 Maintainer: Martin Imobersteg <imm@gmx.ch> 
 Architecture: arm
 License: GPL
 Description: bounce 
  A JezzGame like game for Qtopia.
diff --git a/noncore/games/buzzword/opie-buzzword.control b/noncore/games/buzzword/opie-buzzword.control
index 08b442b..b3e2496 100644
--- a/noncore/games/buzzword/opie-buzzword.control
+++ b/noncore/games/buzzword/opie-buzzword.control
@@ -1,11 +1,11 @@
 Package: opie-buzzword
-Files: bin/buzzword apps/Games/buzzword.desktop pics/buzzword/buzzword.png share/buzzword/buzzwords
+Files: plugins/application/libbuzzword.so* bin/buzzword apps/Games/buzzword.desktop pics/buzzword/buzzword.png share/buzzword/buzzwords
 Version: 1.1-$SUB_VERSION 
 Depends: task-opie-minimal
 Priority: optional
 Section: opie/games
 Maintainer: Martin Imobersteg <imm@gmx.ch> 
 Architecture: arm
 License: GPL
 Description: BuzzWord 
  A BuzzWord Bingo for Qtopia.
diff --git a/noncore/games/fifteen/opie-fifteen.control b/noncore/games/fifteen/opie-fifteen.control
index 8fa355f..a6e8314 100644
--- a/noncore/games/fifteen/opie-fifteen.control
+++ b/noncore/games/fifteen/opie-fifteen.control
@@ -1,11 +1,11 @@
 Package: opie-fifteen
-Files: bin/fifteen apps/Games/fifteen.desktop pics/fifteen
+Files: plugins/application/libfifteen.so* bin/fifteen apps/Games/fifteen.desktop pics/fifteen
 Priority: optional
 Section: opie/games
 Maintainer: Martin Imobersteg <imm@gmx.ch> 
 Architecture: arm
 Arch: iPAQ
 Depends: task-opie-minimal
 Description: Fifteen pieces game
  A game for the Opie environment.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/games/go/opie-go.control b/noncore/games/go/opie-go.control
index 24929de..95b319e 100644
--- a/noncore/games/go/opie-go.control
+++ b/noncore/games/go/opie-go.control
@@ -1,10 +1,10 @@
 Package: opie-go
-Files: bin/go apps/Games/go.desktop pics/go
+Files: plugins/application/libgo.so* bin/go apps/Games/go.desktop pics/go
 Priority: optional
 Section: opie/games
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
 Depends: task-opie-minimal
 Description: The game of Go
  A game for the Opie environment.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/games/kbill/opie-kbill.control b/noncore/games/kbill/opie-kbill.control
index b1422d4..f5a53b8 100644
--- a/noncore/games/kbill/opie-kbill.control
+++ b/noncore/games/kbill/opie-kbill.control
@@ -1,13 +1,13 @@
 Package: opie-kbill
-Files: bin/kbill apps/Games/kbill.desktop pics/kbill/*
+Files: plugins/application/libkbill.so* bin/kbill apps/Games/kbill.desktop pics/kbill/*
 Priority: optional
 Section: opie/games
 Maintainer: Mark Westcott <mark@houseoffish.org>
 Architecture: arm
 Version: 0.8-$SUB_VERSION
 Depends: task-opie-minimal
 License: GPL
 Description: the famous hit Bill game
  Hit Bill as hard as you can before he
  infects your network with a wannabe 
  OS.
diff --git a/noncore/games/kcheckers/opie-kcheckers.control b/noncore/games/kcheckers/opie-kcheckers.control
index e228209..71f83af 100644
--- a/noncore/games/kcheckers/opie-kcheckers.control
+++ b/noncore/games/kcheckers/opie-kcheckers.control
@@ -1,10 +1,10 @@
 Package: opie-kcheckers
-Files: bin/kcheckers apps/Games/kcheckers.desktop pics/kcheckers
+Files: plugins/application/libkcheckers.so* bin/kcheckers apps/Games/kcheckers.desktop pics/kcheckers
 Priority: optional
 Section: opie/games
 Maintainer: leseb <prudhomme@laposte.net>
 Architecture: arm
 Version: 0.3-$SUB_VERSION
 Depends: task-opie-minimal
 Description: The game of Checkers
  A game for the Opie environment.
diff --git a/noncore/games/kpacman/opie-kpacman.control b/noncore/games/kpacman/opie-kpacman.control
index 15e3056..22bb065 100644
--- a/noncore/games/kpacman/opie-kpacman.control
+++ b/noncore/games/kpacman/opie-kpacman.control
@@ -1,11 +1,11 @@
 Package: opie-kpacman
-Files: bin/kpacman apps/Games/kpacman.desktop pics/kpacman/kpacman.png share/kpacman
+Files: plugins/application/libkpacman.so* bin/kpacman apps/Games/kpacman.desktop pics/kpacman/kpacman.png share/kpacman
 Version: 0.3.1-$SUB_VERSION
 Depends: task-opie-minimal
 Priority: optional
 Section: opie/games
 Maintainer: Catalin Climov <catalin@climov.com>
 Architecture: arm
 License: GPL
 Description: Kpacman
  A Pacman clone for Qtopia.
diff --git a/noncore/games/mindbreaker/opie-mindbreaker.control b/noncore/games/mindbreaker/opie-mindbreaker.control
index 7b5ead6..5b342da 100644
--- a/noncore/games/mindbreaker/opie-mindbreaker.control
+++ b/noncore/games/mindbreaker/opie-mindbreaker.control
@@ -1,10 +1,10 @@
 Package: opie-mindbreaker
-Files: bin/mindbreaker apps/Games/mindbreaker.desktop pics/mindbreaker
+Files: plugins/application/libmindbreaker.so* bin/mindbreaker apps/Games/mindbreaker.desktop pics/mindbreaker
 Priority: optional
 Section: opie/games
 Maintainer: Martin Imobersteg <imm@gmx.ch> 
 Architecture: arm
 Depends: task-opie-minimal
 Description: Game: crack the coloured code
  A game for the Opie environment.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/games/minesweep/opie-minesweep.control b/noncore/games/minesweep/opie-minesweep.control
index 32f0352..91343ea 100644
--- a/noncore/games/minesweep/opie-minesweep.control
+++ b/noncore/games/minesweep/opie-minesweep.control
@@ -1,10 +1,10 @@
 Package: opie-minesweep
-Files: bin/minesweep apps/Games/minesweep.desktop pics/minesweep
+Files: plugins/application/libminesweep.so* bin/minesweep apps/Games/minesweep.desktop pics/minesweep
 Priority: optional
 Section: opie/games
 Maintainer: Martin Imobersteg <imm@gmx.ch> 
 Architecture: arm
 Depends: task-opie-minimal
 Description: Game: find the mines
  A game for the Opie environment.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/games/parashoot/opie-parashoot.control b/noncore/games/parashoot/opie-parashoot.control
index 758d24d..139dd3c 100644
--- a/noncore/games/parashoot/opie-parashoot.control
+++ b/noncore/games/parashoot/opie-parashoot.control
@@ -1,10 +1,10 @@
 Package: opie-parashoot
-Files: bin/parashoot apps/Games/parashoot.desktop pics/parashoot
+Files: plugins/application/libparashoot.so* bin/parashoot apps/Games/parashoot.desktop pics/parashoot
 Priority: optional
 Section: opie/games
 Maintainer: Martin Imobersteg <imm@gmx.ch>
 Architecture: arm
 Depends: task-opie-minimal
 Description: Game: shoot the parachutists
  A game for the Opie environment.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/games/qasteroids/opie-qasteroids.control b/noncore/games/qasteroids/opie-qasteroids.control
index 25a49b4..8764578 100644
--- a/noncore/games/qasteroids/opie-qasteroids.control
+++ b/noncore/games/qasteroids/opie-qasteroids.control
@@ -1,10 +1,10 @@
 Package: opie-qasteroids
-Files: bin/qasteroids apps/Games/qasteroids.desktop pics/qasteroids/*
+Files: plugins/application/libqasteroids.so* bin/qasteroids apps/Games/qasteroids.desktop pics/qasteroids/*
 Priority: optional
 Section: opie/games
 Maintainer: Martin Jones <mjones@trolltech.com>
 Architecture: arm
 Depends: task-opie-minimal
 Description: Game: shoot the asteroids
  A game for the Opie environment.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/games/sfcave-sdl/sfcave-sdl.control b/noncore/games/sfcave-sdl/sfcave-sdl.control
index 9bf43ba..6a5773b 100644
--- a/noncore/games/sfcave-sdl/sfcave-sdl.control
+++ b/noncore/games/sfcave-sdl/sfcave-sdl.control
@@ -1,10 +1,10 @@
-Files: bin/sfcave-sdl apps/Games/sfcave-sdl.desktop pics/sfcave-sdl sounds/sfcave-sdl
+Files: plugins/application/libsfcave-sdl.so* bin/sfcave-sdl apps/Games/sfcave-sdl.desktop pics/sfcave-sdl sounds/sfcave-sdl
 Package: sfcave-sdl
 Priority: optional
 Section: Games
 Architecture: arm
 Maintainer: Andy Qua (andy.qua@blueyonder.co.uk)
 Depends:  libSDL,libSDL_-mixer,libSDL-image,libSDL-gfx
 Description: SFCave SDL for the Zaurus. Fly though the cave avoiding the walls.
 
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/games/sfcave/opie-sfcave.control b/noncore/games/sfcave/opie-sfcave.control
index 0ff3e2c..66af03d 100644
--- a/noncore/games/sfcave/opie-sfcave.control
+++ b/noncore/games/sfcave/opie-sfcave.control
@@ -1,9 +1,9 @@
 Package: opie-sfcave
-Files: bin/sfcave apps/Games/sfcave.desktop pics/sfcave
+Files: plugins/application/libsfcave.so* bin/sfcave apps/Games/sfcave.desktop pics/sfcave
 Priority: optional
 Section: opie/games
 Maintainer: Andy Qua <andy.qua@blueyonder.co.uk>
 Architecture: arm
 Depends: task-opie-minimal
 Description: SFCave for the Zaurus. Fly the dot though the cave avoiding the walls.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/games/snake/opie-snake.control b/noncore/games/snake/opie-snake.control
index ef4fc61..f110acd 100644
--- a/noncore/games/snake/opie-snake.control
+++ b/noncore/games/snake/opie-snake.control
@@ -1,10 +1,10 @@
 Package: opie-snake
-Files: bin/snake apps/Games/snake.desktop pics/snake
+Files: plugins/application/libsnake.so* bin/snake apps/Games/snake.desktop pics/snake
 Priority: optional
 Section: opie/games
 Maintainer: Martin Imobersteg <imm@gmx.ch>
 Architecture: arm
 Depends: task-opie-minimal
 Description: Game: control the snake
  A game for the Opie environment.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/games/solitaire/opie-solitaire.control b/noncore/games/solitaire/opie-solitaire.control
index 5fa521f..01f8d83 100644
--- a/noncore/games/solitaire/opie-solitaire.control
+++ b/noncore/games/solitaire/opie-solitaire.control
@@ -1,10 +1,10 @@
 Package: opie-solitaire
-Files: bin/patience apps/Games/patience.desktop pics/cards
+Files: plugins/application/libpatience.so* bin/patience apps/Games/patience.desktop pics/cards
 Priority: optional
 Section: opie/games
 Maintainer: Martin Imobersteg <imm@gmx.ch>
 Architecture: arm
 Depends: task-opie-minimal
 Description: Game: solitaire card games
  A solitaire game for the Opie environment.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/games/tetrix/opie-tetrix.control b/noncore/games/tetrix/opie-tetrix.control
index e901dbf..b1e0bcf 100644
--- a/noncore/games/tetrix/opie-tetrix.control
+++ b/noncore/games/tetrix/opie-tetrix.control
@@ -1,11 +1,11 @@
 Package: opie-tetrix
-Files: bin/tetrix apps/Games/tetrix.desktop pics/tetrix/*
+Files: plugins/application/libtetrix.so* bin/tetrix apps/Games/tetrix.desktop pics/tetrix/*
 Priority: optional
 Section: opie/games
 Maintainer: Martin Imobersteg <imm@gmx.ch>
 Architecture: arm
 Arch: iPAQ
 Depends: task-opie-minimal
 Description: Game: control falling blocks
  A game for the Opie environment.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/games/tictac/opie-tictac.control b/noncore/games/tictac/opie-tictac.control
index 0074505..0b124c9 100644
--- a/noncore/games/tictac/opie-tictac.control
+++ b/noncore/games/tictac/opie-tictac.control
@@ -1,9 +1,9 @@
 Package: opie-tictac
-Files: bin/tictac apps/Games/tictac.desktop pics/tictac
+Files: plugins/application/libtictac.so* bin/tictac apps/Games/tictac.desktop pics/tictac
 Priority: optional
 Section: opie/games
 Maintainer: ljp <ljp@llornkcor.com>
 Architecture: arm
 Depends: task-opie-minimal
 Description: Tic Tac Toe game.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/games/wordgame/opie-wordgame.control b/noncore/games/wordgame/opie-wordgame.control
index c7dc126..6082c6e 100644
--- a/noncore/games/wordgame/opie-wordgame.control
+++ b/noncore/games/wordgame/opie-wordgame.control
@@ -1,11 +1,11 @@
 Package: opie-wordgame
-Files: bin/wordgame apps/Games/wordgame.desktop pics/wordgame
+Files: plugins/application/libwordgame.so* bin/wordgame apps/Games/wordgame.desktop pics/wordgame
 Priority: optional
 Section: opie/games
 Maintainer: Martin Imobersteg <imm@gmx.ch> 
 Architecture: arm
 Depends: task-opie-minimal
 Description: Crossword game
  A crossword game for the Opie environment.
  Play against the computer or human opponents.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/graphics/drawpad/opie-drawpad.control b/noncore/graphics/drawpad/opie-drawpad.control
index 5095b52..2bf78f0 100644
--- a/noncore/graphics/drawpad/opie-drawpad.control
+++ b/noncore/graphics/drawpad/opie-drawpad.control
@@ -1,12 +1,12 @@
 Package: opie-drawpad
-Files: bin/drawpad apps/1Pim/drawpad.desktop pics/drawpad
+Files: plugins/application/libdrawpad.so* bin/drawpad apps/1Pim/drawpad.desktop pics/drawpad
 Priority: optional
 Section: opie/applications
 Maintainer: Sébastien Prud'homme <prudhomme@laposte.net>
 Architecture: arm
 Depends: task-opie-minimal, libopie1
 Description: A note taking program with basic draw tools
  DrawPad is an easy note taking program for Zaurus.  It can also
  be used to draw simple images. DrawPad was developed for the Opie
  project, an alternative to the standard Zaurus environment.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/multimedia/camera/opie-camera.control b/noncore/multimedia/camera/opie-camera.control
index 8634cf1..6dacb36 100644
--- a/noncore/multimedia/camera/opie-camera.control
+++ b/noncore/multimedia/camera/opie-camera.control
@@ -1,10 +1,10 @@
 Package: opie-camera
-Files: lib/libopiecam.* bin/opiecam bin/capture pics/camera apps/Applications/camera.desktop
+Files: plugins/application/libopiecam.so* lib/libopiecam.* bin/opiecam bin/capture pics/camera apps/Applications/camera.desktop
 Priority: optional
 Section: opie/applications
 Maintainer: Michael 'Mickey' Lauer <mickeyl@handhelds.org> 
 Architecture: arm
 Version: 1.0.1-$SUB_VERSION
 Depends: task-opie-minimal, libopie2 (1.8.1)
 Description: A Camera Application
  A Camera Application to use with the Sharp CE-AG06.
diff --git a/noncore/multimedia/opieplayer2/opie-mediaplayer2.control b/noncore/multimedia/opieplayer2/opie-mediaplayer2.control
index 10c5d19..8e68c57 100644
--- a/noncore/multimedia/opieplayer2/opie-mediaplayer2.control
+++ b/noncore/multimedia/opieplayer2/opie-mediaplayer2.control
@@ -1,11 +1,11 @@
 Package: opie-mediaplayer2
-Files: bin/opieplayer2  apps/Applications/mediaplayer.desktop pics/opieplayer2/add_to_playlist.png pics/opieplayer2/cut.png pics/opieplayer2/delete.png  pics/opieplayer2/down.png  pics/opieplayer2/loop.png pics/opieplayer2/MPEGPlayer.png pics/opieplayer2/musicfile.png pics/opieplayer2/playlist2.png pics/opieplayer2/play.png pics/opieplayer2/remove_from_playlist.png pics/opieplayer2/shuffle.png  pics/opieplayer2/up.png pics/opieplayer2/videofile.png
+Files: plugins/application/libopieplayer2.so* bin/opieplayer2  apps/Applications/mediaplayer.desktop pics/opieplayer2/add_to_playlist.png pics/opieplayer2/cut.png pics/opieplayer2/delete.png  pics/opieplayer2/down.png  pics/opieplayer2/loop.png pics/opieplayer2/MPEGPlayer.png pics/opieplayer2/musicfile.png pics/opieplayer2/playlist2.png pics/opieplayer2/play.png pics/opieplayer2/remove_from_playlist.png pics/opieplayer2/shuffle.png  pics/opieplayer2/up.png pics/opieplayer2/videofile.png
 Priority: optional
 Section: opie/applications
 Maintainer: L.J.Potter <ljp@llornkcor.com>, Maximilian Reiss <harlekin@handhelds.org>
 Architecture: arm
-Depends: task-opie-minimal, libopie1, zlib1g, libstdc++2.10-glibc2.2, opie-mediaplayer2-skin-default | opie-mediaplayer2-skin-default-landscape , libxine1 | opie-mediaplayer2-codecs
-Description: The Opie media player
+Depends: task-opie-minimal, libopie1, zlib1g, opie-mediaplayer2-skin-default | opie-mediaplayer2-skin-default-landscape , libxine1 | opie-mediaplayer2-codecs
+Description: The Opie media player II
  The mediaplayer for Opie. It plays mp3, mpeg, wav, ogg, quicktime, divx and
  more. Also it is streaming capable.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/multimedia/opierec/opierec.control b/noncore/multimedia/opierec/opierec.control
index a1a2b7e..f5270e0 100644
--- a/noncore/multimedia/opierec/opierec.control
+++ b/noncore/multimedia/opierec/opierec.control
@@ -1,10 +1,10 @@
 Package: opierec
-Files: bin/opierec pics/opierec apps/Applications/opierec.desktop 
+Files: plugins/application/libopierec.so* bin/opierec pics/opierec apps/Applications/opierec.desktop 
 Priority: optional
 Section: multimedia/applications
 Maintainer: L.J. Potter <ljp@llornkcor.com>
 Architecture: arm
 Depends: opie ($QPE_VERSION)
 Description: audio sampling recorder
  A simple audio recording/playing application.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/multimedia/showimg/opie-showimg.control b/noncore/multimedia/showimg/opie-showimg.control
index c543335..97b7fb7 100644
--- a/noncore/multimedia/showimg/opie-showimg.control
+++ b/noncore/multimedia/showimg/opie-showimg.control
@@ -1,11 +1,11 @@
 Package: opie-showimg
-Files: bin/showimg apps/Applications/showimg.desktop pics/imageviewer
+Files: plugins/application/libshowimg.so* bin/showimg apps/Applications/showimg.desktop pics/imageviewer
 Priority: optional
 Section: opie/applications
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
 Depends: task-opie-minimal
 Description: Image Viewer
  The image viewer for the Opie environment. Supports
  Whichever formats are compiled into Qt/Embedded (eg. PNG).
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/net/mailit/opie-mailit.control b/noncore/net/mailit/opie-mailit.control
index 77d4102..c20cdf5 100644
--- a/noncore/net/mailit/opie-mailit.control
+++ b/noncore/net/mailit/opie-mailit.control
@@ -1,9 +1,9 @@
 Package: opie-mailit
-Files: bin/mailit apps/1Pim/mailit.desktop pics/mailit
+Files: plugins/application/libmailit.so* bin/mailit apps/1Pim/mailit.desktop pics/mailit
 Priority: optional
 Section: opie
 Maintainer: L.J. Potter <llornkcor@handhelds.org>
 Architecture: arm
 Version: $QPE_VERSION$EXTRAVERSION
 Description: EMail
  A simple POP3 email client for the Opie environment.
diff --git a/noncore/net/opieftp/opie-ftp.control b/noncore/net/opieftp/opie-ftp.control
index 1e82523..269bd49 100644
--- a/noncore/net/opieftp/opie-ftp.control
+++ b/noncore/net/opieftp/opie-ftp.control
@@ -1,11 +1,11 @@
 Package: opie-ftp
-Files: bin/opieftp pics/opieftp apps/Applications/opieftp.desktop
+Files: plugins/application/libopieftp.so* bin/opieftp pics/opieftp apps/Applications/opieftp.desktop
 Priority: optional
 Section: Communications
 Maintainer: L.J. Potter <ljp@llornkcor.com> 
 Architecture: arm
 Depends: task-opie-minimal, ftplib
 Replaces: opieftp
 Description: Opie-Ftp
  The ftp client for the Opie environment.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/net/opieirc/opie-irc.control b/noncore/net/opieirc/opie-irc.control
index 51a8049..be31d9c 100644
--- a/noncore/net/opieirc/opie-irc.control
+++ b/noncore/net/opieirc/opie-irc.control
@@ -1,9 +1,9 @@
 Package: opie-irc
-Files: bin/opieirc pics/opieirc apps/Applications/opieirc.desktop help/en/html/opieirc.html help/en/html/opieirc
+Files: plugins/application/libopieirc.so* bin/opieirc pics/opieirc apps/Applications/opieirc.desktop help/en/html/opieirc.html help/en/html/opieirc
 Priority: optional
 Section: Communications
 Maintainer: Wenzel Jakob <root@wazlaf.de>
 Architecture: arm
 Depends: task-opie-minimal, libopie1
 Description: The Opie IRC client lets you chat on your favorite IRC server using your handheld computer
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/net/opietooth/blue-pin/opie-bluepin.control b/noncore/net/opietooth/blue-pin/opie-bluepin.control
index 297fdfe..89a4746 100644
--- a/noncore/net/opietooth/blue-pin/opie-bluepin.control
+++ b/noncore/net/opietooth/blue-pin/opie-bluepin.control
@@ -1,11 +1,11 @@
 Package: opie-bluepin
-Files: bin/bluepin
+Files: plugins/application/libbluepin.so* bin/bluepin
 Priority: optional
 Section: opie/applications
 Maintainer: Holger Freyther <zecke@handhelds.org>
 Architecture: arm
 Version: 0.3.4-$SUB_VERSION
 Depends: task-opie-minimal
 License: GPL
 Description: Bluetooth pin application
 
diff --git a/noncore/net/opietooth/manager/opie-bluetoothmanager.control b/noncore/net/opietooth/manager/opie-bluetoothmanager.control
index 4e0a5fa..a9996cf 100644
--- a/noncore/net/opietooth/manager/opie-bluetoothmanager.control
+++ b/noncore/net/opietooth/manager/opie-bluetoothmanager.control
@@ -1,11 +1,11 @@
 Package: opie-bluetoothmanager
-Files: bin/bluetooth-manager apps/Settings/bluetooth-manager.desktop pics/opietooth/*
+Files: plugins/application/libbluetooth-manager.so* bin/bluetooth-manager apps/Settings/bluetooth-manager.desktop pics/opietooth/*
 Priority: optional
 Section: opie/applications
 Maintainer: Maximilian Reiß <max.reiss@gmx.de>
 Architecture: arm
 Version: 0.5.4-$SUB_VERSION
 Depends: task-opie-minimal, libopietooth1, opie-bluepin
 License: GPL
 Description: Bluetooth Manager application
 
diff --git a/noncore/net/wellenreiter/opie-wellenreiter.control b/noncore/net/wellenreiter/opie-wellenreiter.control
index 1d35019..95729e3 100644
--- a/noncore/net/wellenreiter/opie-wellenreiter.control
+++ b/noncore/net/wellenreiter/opie-wellenreiter.control
@@ -1,10 +1,10 @@
 Package: opie-wellenreiter
-Files: bin/wellenreiter pics/wellenreiter apps/Applications/wellenreiter.desktop
+Files: plugins/application/libwellenreiter.so* bin/wellenreiter pics/wellenreiter apps/Applications/wellenreiter.desktop
 Priority: optional
 Section: opie/applications
 Maintainer: Michael 'Mickey' Lauer <mickeyl@handhelds.org> 
 Architecture: arm
 Version: 0.9.9-$SUB_VERSION
 Depends: task-opie-minimal, libpcap0 (0.7.2), libopie2 (1.8.1)
 Description: A WaveLAN Network Monitor
  A WaveLAN Network Monitor/Sniffer for the Opie Environment.
diff --git a/noncore/settings/appearance2/opie-appearance.control b/noncore/settings/appearance2/opie-appearance.control
index 2b08c76..724276e 100644
--- a/noncore/settings/appearance2/opie-appearance.control
+++ b/noncore/settings/appearance2/opie-appearance.control
@@ -1,10 +1,10 @@
 Package: opie-appearance
-Files: bin/appearance apps/Settings/Appearance.desktop pics/appearance
+Files: plugins/application/libappearance.so* bin/appearance apps/Settings/Appearance.desktop pics/appearance
 Priority: optional
 Section: opie/settings
 Maintainer: Dan Williams <wiliamsdr@acm.org>
 Architecture: arm
 Depends: task-opie-minimal, libopie1
 Description: Appearance settings dialog
  For the Opie environment.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/settings/aqpkg/opie-aqpkg.control b/noncore/settings/aqpkg/opie-aqpkg.control
index 46bffdd..e971f1c 100644
--- a/noncore/settings/aqpkg/opie-aqpkg.control
+++ b/noncore/settings/aqpkg/opie-aqpkg.control
@@ -1,11 +1,11 @@
 Package: opie-aqpkg
-Files: bin/aqpkg pics/aqpkg apps/Settings/aqpkg.desktop 
+Files: plugins/application/libaqpkg.so* bin/aqpkg pics/aqpkg apps/Settings/aqpkg.desktop 
 Priority: optional
 Section: Settings
 Depends: task-opie-minimal
 Replaces: aqpkg
 Architecture: arm
 Maintainer: Andy Qua (andy.qua@blueyonder.co.uk)
 Description: A Package Manager
 
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/settings/backup/opie-backup.control b/noncore/settings/backup/opie-backup.control
index 991f58b..fdb66fc 100644
--- a/noncore/settings/backup/opie-backup.control
+++ b/noncore/settings/backup/opie-backup.control
@@ -1,9 +1,9 @@
 Package: opie-backup
-Files: bin/backup pics/backup apps/Settings/backup.desktop
+Files: plugins/application/libbackup.so* bin/backup pics/backup apps/Settings/backup.desktop
 Priority: optional
 Depends: task-opie-minimal
 Architecture: arm
 Maintainer: Stefan Eilers <Eilers.Stefan@epost.de>
 Section: opie/Settings
 Description: Backup and Restore utility.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/settings/language/opie-language.control b/noncore/settings/language/opie-language.control
index f4040aa..27c58fc 100644
--- a/noncore/settings/language/opie-language.control
+++ b/noncore/settings/language/opie-language.control
@@ -1,10 +1,10 @@
 Package: opie-language
-Files: bin/language apps/Settings/Language.desktop
+Files: plugins/application/liblanguage.so* bin/language apps/Settings/Language.desktop
 Priority: optional
 Section: opie/settings
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
 Depends: task-opie-minimal
 Description: Language settings dialog
  For the Opie environment.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/settings/mediummount/opie-mediummount.control b/noncore/settings/mediummount/opie-mediummount.control
index 637095f..772b9a6 100644
--- a/noncore/settings/mediummount/opie-mediummount.control
+++ b/noncore/settings/mediummount/opie-mediummount.control
@@ -1,11 +1,11 @@
 Package: opie-mediummount
-Files: bin/mediummount apps/Settings/medium.desktop pics/mediummount/*
+Files: plugins/application/libmediummount.so* bin/mediummount apps/Settings/medium.desktop pics/mediummount/*
 Priority: optional
 Section: opie/settings
 Maintainer: Holger Freyther <zecke@handhelds.org>
 Architecture: arm
 Depends: task-opie-minimal
 License: GPL
 Description: Configure app for the medium mounter
  Configure app for the medium mounter
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/settings/netsystemtime/opie-systemtime.control b/noncore/settings/netsystemtime/opie-systemtime.control
index ced9333..d62dc33 100644
--- a/noncore/settings/netsystemtime/opie-systemtime.control
+++ b/noncore/settings/netsystemtime/opie-systemtime.control
@@ -1,11 +1,11 @@
 Package: opie-systemtime
-Files: bin/systemtime apps/Settings/netsystemtime.desktop etc/ntpservers pics/netsystemtime 
+Files: plugins/application/libsystemtime.so* bin/systemtime apps/Settings/netsystemtime.desktop etc/ntpservers pics/netsystemtime 
 Priority: optional
 Section: opie/settings
 Provides: opie-netsystemtime
 Maintainer: Patrick S. Vogt <tille@handhelds.org>
 Architecture: arm
 Depends: task-opie-minimal, ntpdate, libopie1
 Description: ntp (Network  Time  Protocol) gui
  This utility syncs system time with a atomic timerserver via internet
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/settings/networksettings/opie-networksettings.control b/noncore/settings/networksettings/opie-networksettings.control
index 124d1e6..82aac2a 100644
--- a/noncore/settings/networksettings/opie-networksettings.control
+++ b/noncore/settings/networksettings/opie-networksettings.control
@@ -1,10 +1,10 @@
 Package: opie-networksettings
-Files: bin/networksettings apps/Settings/networksettings.desktop pics/networksettings/* pics/Network/PPPConnect.png $OPIEDIR/lib/libinterfaces.so* root/usr/bin/changedns bin/getprofile
+Files: plugins/application/libnetworksettings.so* bin/networksettings apps/Settings/networksettings.desktop pics/networksettings/* pics/Network/PPPConnect.png $OPIEDIR/lib/libinterfaces.so* root/usr/bin/changedns bin/getprofile
 Priority: optional
 Section: opie/settings
 Maintainer: Patrick S. Vogt <tille@handhelds.org>
 Architecture: arm
 Depends: task-opie-minimal
 Description: Network settings.
 Replaces: opie-networksetup
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/settings/sound/opie-vmemo-settings.control b/noncore/settings/sound/opie-vmemo-settings.control
index d7589d3..5a4c1d5 100644
--- a/noncore/settings/sound/opie-vmemo-settings.control
+++ b/noncore/settings/sound/opie-vmemo-settings.control
@@ -1,12 +1,12 @@
 Package: opie-vmemo-settings
-Files: bin/sound apps/Settings/Sound.desktop
+Files: plugins/application/libsound.so* bin/sound apps/Settings/Sound.desktop
 Priority: optional
 Section: opie/settings
 Maintainer: L.J. Potter
 Architecture: arm
 Arch: iPAQ
 Conflicts: opie-sound
 Depends: task-opie-minimal
 Description: Sound settings dialog
  For the Opie environment.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/settings/sshkeys/opie-sshkeys.control b/noncore/settings/sshkeys/opie-sshkeys.control
index 44c58b6..d05858c 100644
--- a/noncore/settings/sshkeys/opie-sshkeys.control
+++ b/noncore/settings/sshkeys/opie-sshkeys.control
@@ -1,9 +1,9 @@
 Package: opie-sshkeys
-Files: bin/sshkeys apps/Settings/sshkeys.desktop pics/sshkeys/sshkeys.png
+Files: plugins/application/libsshkeys.so* bin/sshkeys apps/Settings/sshkeys.desktop pics/sshkeys/sshkeys.png
 Priority: optional
 Section: opie/settings
 Maintainer: David Woodhouse <dwmw2@infradead.org>
 Architecture: arm
 Depends: task-opie-minimal, ssh, opie-sh-ssh-askpass
 Description: Utility for managing ssh-agent keys.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/settings/sysinfo/opie-sysinfo.control b/noncore/settings/sysinfo/opie-sysinfo.control
index 8250174..b79e9ec 100644
--- a/noncore/settings/sysinfo/opie-sysinfo.control
+++ b/noncore/settings/sysinfo/opie-sysinfo.control
@@ -1,10 +1,10 @@
 Package: opie-sysinfo
-Files: bin/sysinfo apps/Settings/sysinfo.desktop pics/sysinfo
+Files: plugins/application/libsysinfo.so* bin/sysinfo apps/Settings/sysinfo.desktop pics/sysinfo
 Priority: optional
 Section: opie/applications
 Maintainer: Dan Williams <williamsdr@acm.org>
 Architecture: arm
 Depends: task-opie-minimal, libopie1
 Description: System Information dialog
  For the Opie environment.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/settings/tabmanager/opie-tabmanager.control b/noncore/settings/tabmanager/opie-tabmanager.control
index f064f12..b7ef1d2 100644
--- a/noncore/settings/tabmanager/opie-tabmanager.control
+++ b/noncore/settings/tabmanager/opie-tabmanager.control
@@ -1,11 +1,11 @@
 Package: opie-tabmanager
-Files: bin/tabmanager apps/Settings/tabmanager.desktop pics/tabmanager/tabmanager.png
+Files: plugins/application/libtabmanager.so* bin/tabmanager apps/Settings/tabmanager.desktop pics/tabmanager/tabmanager.png
 Priority: optional
 Section: opie/settings
 Depends: task-opie-minimal
 Architecture: arm
 Maintainer: Benjamin Meyer <meyerb@sharpsec.com>
 Description: Tab Manager
  Create new tabs, remove old tabs. Edit tab's name, comment and icon.
  Edit applications name, exec, comment and icon. Add/remove applications.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/settings/usermanager/opie-usermanager.control b/noncore/settings/usermanager/opie-usermanager.control
index 90367e6..5061366 100644
--- a/noncore/settings/usermanager/opie-usermanager.control
+++ b/noncore/settings/usermanager/opie-usermanager.control
@@ -1,10 +1,10 @@
 Package: opie-usermanager
-Files: bin/usermanager apps/Settings/usermanager.desktop pics/usermanager/*
+Files: plugins/application/libusermanager.so* bin/usermanager apps/Settings/usermanager.desktop pics/usermanager/*
 Priority: optional
 Section: opie/settings
 Depends: task-opie-minimal
 Architecture: arm
 Maintainer: Ted Parnefors <zaurus@bredband.net>
 License: GPL
 Description: User/Group manager for Opie.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/todayplugins/stockticker/opie-today-stocktickerplugin.control b/noncore/todayplugins/stockticker/opie-today-stocktickerplugin.control
index 5b328d9..b21c8de 100644
--- a/noncore/todayplugins/stockticker/opie-today-stocktickerplugin.control
+++ b/noncore/todayplugins/stockticker/opie-today-stocktickerplugin.control
@@ -1,9 +1,9 @@
 Package: opie-today-stocktickerplugin
-Files: plugins/today/libtodaystocktickerplugin.so* bin/stockticker pics/stockticker/stockticker.png
+Files: plugins/application/libstockticker.so* plugins/today/libtodaystocktickerplugin.so* bin/stockticker pics/stockticker/stockticker.png
 Priority: optional
 Section: opie/applications
 Maintainer: ljp <llornkcor@handhelds.org>
 Architecture: arm
 Depends: libqte2, opie-today
 Description: stockticker plugin for today
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/tools/calculator/opie-calculator.control b/noncore/tools/calculator/opie-calculator.control
index 79d6970..d1852cf 100644
--- a/noncore/tools/calculator/opie-calculator.control
+++ b/noncore/tools/calculator/opie-calculator.control
@@ -1,11 +1,11 @@
 Package: opie-calculator
-Files: bin/calculator apps/Applications/calculator.desktop etc/unit_conversion.dat pics/calc
+Files: plugins/application/libcalculator.so* bin/calculator apps/Applications/calculator.desktop etc/unit_conversion.dat pics/calc
 Priority: optional
 Section: opie/applications
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
 Depends: task-opie-minimal
 Description: Calculator
  A multi-function calculator for the Opie environment.
  Includes units conversion.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/tools/clock/opie-clock.control b/noncore/tools/clock/opie-clock.control
index 381feba..e49cc46 100644
--- a/noncore/tools/clock/opie-clock.control
+++ b/noncore/tools/clock/opie-clock.control
@@ -1,10 +1,10 @@
 Package: opie-clock
-Files: bin/clock apps/Applications/clock.desktop
+Files: plugins/application/libclock.so* bin/clock apps/Applications/clock.desktop
 Priority: optional
 Section: opie/applications
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
 Depends: task-opie-minimal
 Description: Clock and stop-watch
  A simple clock and stop-watch for the Opie environment.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/tools/euroconv/opie-euroconv.control b/noncore/tools/euroconv/opie-euroconv.control
index 711be63..dbb9774 100644
--- a/noncore/tools/euroconv/opie-euroconv.control
+++ b/noncore/tools/euroconv/opie-euroconv.control
@@ -1,10 +1,10 @@
 Package: opie-euroconv
-Files: bin/euroconv pics/euroconv/* apps/Applications/euroconv.desktop
+Files: plugins/application/libeuroconv.so* bin/euroconv pics/euroconv/* apps/Applications/euroconv.desktop
 Priority: optional
 Section: opie/applications
 Maintainer: Eric Santonacci <Eric.Santonacci@talc.fr>
 Architecture: arm
 Depends: task-opie-minimal
 Description: Euroconv
  Converts currencies between different european formats
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/tools/formatter/opie-formatter.control b/noncore/tools/formatter/opie-formatter.control
index ef710b0..f57ee1e 100644
--- a/noncore/tools/formatter/opie-formatter.control
+++ b/noncore/tools/formatter/opie-formatter.control
@@ -1,11 +1,11 @@
 Package: opie-formatter
-Files: bin/formatter pics/formatter/devices.png apps/Settings/formatter.desktop
+Files: plugins/application/libformatter.so* bin/formatter pics/formatter/devices.png apps/Settings/formatter.desktop
 Priority: optional
 Section: opie/applications
 Maintainer: L.J. Potter <ljp@llornkcor.com> 
 Architecture: arm
 Depends: task-opie-minimal
 Description: Formatter
  The filesystem formatting and mountpoint app for the Opie environment.
 ronment.

 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/tools/opie-sh/opie-sh.control b/noncore/tools/opie-sh/opie-sh.control
index dc55b18..a5619ce 100644
--- a/noncore/tools/opie-sh/opie-sh.control
+++ b/noncore/tools/opie-sh/opie-sh.control
@@ -1,11 +1,11 @@
 Package: opie-sh
-Files: bin/opie-sh bin/opie-sh-howto.sh apps/Opie-SH/opie-sh.desktop pics/opie-sh/*.png help/opie-sh/*.html
+Files: plugins/application/libopie-sh.so* bin/opie-sh bin/opie-sh-howto.sh apps/Opie-SH/opie-sh.desktop pics/opie-sh/*.png help/opie-sh/*.html
 Priority: optional
 Section: opie/applications
 Maintainer: Thomas Stephens <spiralman@softhome.net>
 Architecture: arm
 Version: 0.5-$SUB_VERSION
 Depends: task-opie-minimal
 License: GPL
 Description: a QDialog shell frontend
  A program to let you use various dialogs from the console (or a shell script)
diff --git a/noncore/tools/remote/opie-remote.control b/noncore/tools/remote/opie-remote.control
index a3255db..78bfbc9 100644
--- a/noncore/tools/remote/opie-remote.control
+++ b/noncore/tools/remote/opie-remote.control
@@ -1,11 +1,11 @@
 Package: opie-remote
-Files: bin/remote apps/Applications/remote.desktop pics/remote/*.png
+Files: plugins/application/libremote.so* bin/remote apps/Applications/remote.desktop pics/remote/*.png
 Priority: optional
 Section: opie/applications
 Maintainer: Thomas Stephens <spiralman@softhome.net>
 Architecture: arm
 Version: $QPE_VERSION$EXTRAVERSION
 Depends: task-opie-minimal, lirc
 License: GPL
 Description: a remote control
  A remote control using irda. A frontend to lirc.
diff --git a/noncore/unsupported/gsmtool/opie-gsmtool.control b/noncore/unsupported/gsmtool/opie-gsmtool.control
index 6d00720..6bd3b46 100644
--- a/noncore/unsupported/gsmtool/opie-gsmtool.control
+++ b/noncore/unsupported/gsmtool/opie-gsmtool.control
@@ -1,11 +1,11 @@
 Package: opie-gsmtool
-Files: bin/gsmtool apps/Applications/gsmtool.desktop pics/gsmtool
+Files: plugins/application/libgsmtool.so* bin/gsmtool apps/Applications/gsmtool.desktop pics/gsmtool
 Priority: optional
 Section: opie/applications
 Maintainer: David Woodhouse <dwmw2@infradead.org>
 Architecture: arm
 Version: 1.0.0-2
 Depends: task-opie-minimal, gsmlib
 License: Public Domain
 Description: GSMTool program
  An GSM phone utility program for the Opie environment.
diff --git a/noncore/unsupported/mail2/opie-mail2.control b/noncore/unsupported/mail2/opie-mail2.control
index 976dc0b..bfb5026 100644
--- a/noncore/unsupported/mail2/opie-mail2.control
+++ b/noncore/unsupported/mail2/opie-mail2.control
@@ -1,10 +1,10 @@
 Package: opie-mail2
-Files: bin/mail $OPIEDIR/lib/libmail.so* apps/1Pim/mail.desktop pics/mail/*.png sounds/mail/*.wav
+Files: plugins/application/libmail.so* bin/mail $OPIEDIR/lib/libmail.so* apps/1Pim/mail.desktop pics/mail/*.png sounds/mail/*.wav
 Priority: optional
 Section: opie/applications
 Maintainer: Constantin Bergemann <cbergemann@lisa.de>
 Architecture: arm
 Version: $QPE_VERSION$EXTRAVERSION
 Depends: task-opie-minimal, libopie1
 Description: An IMAP mail client
 License: LGPL
diff --git a/noncore/unsupported/mailit/opie-mailit.control b/noncore/unsupported/mailit/opie-mailit.control
index 77d4102..c20cdf5 100644
--- a/noncore/unsupported/mailit/opie-mailit.control
+++ b/noncore/unsupported/mailit/opie-mailit.control
@@ -1,9 +1,9 @@
 Package: opie-mailit
-Files: bin/mailit apps/1Pim/mailit.desktop pics/mailit
+Files: plugins/application/libmailit.so* bin/mailit apps/1Pim/mailit.desktop pics/mailit
 Priority: optional
 Section: opie
 Maintainer: L.J. Potter <llornkcor@handhelds.org>
 Architecture: arm
 Version: $QPE_VERSION$EXTRAVERSION
 Description: EMail
  A simple POP3 email client for the Opie environment.
diff --git a/noncore/unsupported/qpdf/opie-qpdf.control b/noncore/unsupported/qpdf/opie-qpdf.control
index 208dcb1..6d4fd22 100644
--- a/noncore/unsupported/qpdf/opie-qpdf.control
+++ b/noncore/unsupported/qpdf/opie-qpdf.control
@@ -1,9 +1,9 @@
 Package: opie-qpdf
-Files: bin/qpdf apps/Applications/qpdf.desktop pics/qpdf/qpdf_icon.png
+Files: plugins/application/libqpdf.so* bin/qpdf apps/Applications/qpdf.desktop pics/qpdf/qpdf_icon.png
 Priority: optional
 Section: opie/applications
 Maintainer: Robert Griebl <sandman@handhelds.org>
 Architecture: arm
 Depends: task-opie-minimal, gzip
 Description: A PDF viewer for OPIE.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/scripts/remove/opie-remove.control b/scripts/remove/opie-remove.control
index c837dc8..5959985 100644
--- a/scripts/remove/opie-remove.control
+++ b/scripts/remove/opie-remove.control
@@ -1,7 +1,7 @@
 Package: opie-remove
 Maintainer: Patrick S. Vogt <tille@handhelds.org>
 Section: opie/system
 Priority: optional
 Version: 0.9.1
 Description: Remove opie -- Use at own risc -- will remove opie and /opt/QtPalmtop/
-Files:
+Files: bin/opie-remove
diff --git a/scripts/remove/qpe-remove.control b/scripts/remove/qpe-remove.control
index 0b766d9..be23e2a 100644
--- a/scripts/remove/qpe-remove.control
+++ b/scripts/remove/qpe-remove.control
@@ -1,7 +1,7 @@
 Package: qpe-remove
 Maintainer: Patrick S. Vogt <tille@handhelds.org>
 Section: opie/system
 Priority: optional
 Version: 0.9.1
 Description: Remove qtopia -- Use at own risc -- will remove qtopia and /opt/QtPalmtop/
-Files:
+Files: bin/qpe-remove
diff --git a/scripts/update/opie-update.control b/scripts/update/opie-update.control
index e8fdc65..7ae8c96 100644
--- a/scripts/update/opie-update.control
+++ b/scripts/update/opie-update.control
@@ -1,8 +1,8 @@
 Package: opie-update
 Maintainer: Patrick S. Vogt <tille@handhelds.org>
 Section: opie/system
 Priority: optional
 Version: 0.9.1
 Description: Reinstall opie.  Dummy package that reinstalls opie, by removing 
  everything and reinstalling it.
-Files:
+Files: bin/opie-upgrade
diff --git a/scripts/update/qpe-opie-update.control b/scripts/update/qpe-opie-update.control
index add6746..cc3f38c 100644
--- a/scripts/update/qpe-opie-update.control
+++ b/scripts/update/qpe-opie-update.control
@@ -1,9 +1,9 @@
 Package: qpe-opie-update
 Maintainer: Patrick S. Vogt <tille@handhelds.org>
 Section: opie/system
 Priority: optional
 Version: 0.9.1
 Description: Remove qtopia and install opie.  Dummy package that removes qtopia
  and installs opie, by removing everything and installing the same opie
  packages.
-Files:
+Files: bin/qpe-opie-upgrade