diff --git a/debian/control b/debian/control
index ce8e0415e..fd59a148d 100644
--- a/debian/control
+++ b/debian/control
@@ -32,18 +32,6 @@ Description: a modern and scalable groupware - development files
  .
  This package contains the development files for developing SOGo modules.
 
-Package: sogo-openchange
-Section: net
-Priority: extra
-Architecture: any
-Depends: sogo (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Description: a modern and scalable groupware - OpenChange backend
- SOGo is a groupware server built around OpenGroupware.org (OGo) and
- the SOPE application server with focus on scalability.
- .
- This package contains the backend plugin for using SOGo as a backend
- to OpenChange.
-
 Package: sogo-dbg
 Section: debug
 Priority: extra
diff --git a/debian/control-squeeze b/debian/control-squeeze
index 019b6335b..ce8e0415e 100644
--- a/debian/control-squeeze
+++ b/debian/control-squeeze
@@ -22,16 +22,27 @@ Description: a modern and scalable groupware
  UI for the users, consistency in look and feel with the Mozilla applications,
  and to reduce the load of the transactions on the server.
 
+Package: sogo-dev
+Section: devel
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: a modern and scalable groupware - development files
+ SOGo is a groupware server built around OpenGroupware.org (OGo) and
+ the SOPE application server with focus on scalability.
+ .
+ This package contains the development files for developing SOGo modules.
+
 Package: sogo-openchange
 Section: net
 Priority: extra
 Architecture: any
-Depends: sogo (= ${binary:Version}), ${misc:Depends}
+Depends: sogo (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Description: a modern and scalable groupware - OpenChange backend
  SOGo is a groupware server built around OpenGroupware.org (OGo) and
  the SOPE application server with focus on scalability.
  .
- This package contains the backend plugin for using SOGo as a backend to OpenChange.
+ This package contains the backend plugin for using SOGo as a backend
+ to OpenChange.
 
 Package: sogo-dbg
 Section: debug
diff --git a/debian/sogo-dev.install b/debian/sogo-dev.install
new file mode 100644
index 000000000..a29817742
--- /dev/null
+++ b/debian/sogo-dev.install
@@ -0,0 +1,2 @@
+usr/include/GNUstep/*
+usr/lib/lib*.so
diff --git a/debian/sogo-openchange.install b/debian/sogo-openchange.install
new file mode 100644
index 000000000..dcae5f4e2
--- /dev/null
+++ b/debian/sogo-openchange.install
@@ -0,0 +1,2 @@
+usr/lib/mapistore_backends/*
+usr/lib/GNUstep/SOGo/SOGoBackend.MAPIStore