diff --git a/debian/control.in b/debian/control.in
index aeea5a3..f0d1a7e 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -13,8 +13,12 @@
 
 Package: sugar-etoys-activity
 Architecture: all
-Depends: ${shlibs:Depends}, ${python:Depends}, ${cdbs:Depends}, ${misc:Depends}, etoys
-Recommends: sugar
+Depends: ${cdbs:Depends},
+ ${misc:Depends},
+ ${python:Depends},
+ ${shlibs:Depends}
+Recommends: ${cdbs:Recommends}
+Sugests: ${cdbs:Suggests}
 Provides: ${python:Provides}
 Description: Sugar wrapper around the Squeak Etoys programming language
  Sugar is a desktop environment. It is conceived as a platform upon
diff --git a/debian/rules b/debian/rules
index 052e964..4d7a4c1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -33,9 +33,9 @@
 
 DEB_SUGAR_PRIMARY_BRANCH = 0.88
 
-CDBS_DEPENDS_$(pkg) = $(call cdbs_sugar_anybranchdeps,python-sugar python-sugar-toolkit)
-CDBS_DEPENDS_$(pkg) += , python-hippocanvas, python-telepathy, python-gtk2, python-cjson
-CDBS_DEPENDS_$(pkg) += , sugar-presence-service-0.90 | sugar-presence-service
+CDBS_DEPENDS_$(pkg) = etoys
+CDBS_RECOMMENDS_$(pkg) = $(call cdbs_sugar_anybranchdeps,sugar-session)
+CDBS_RECOMMENDS_$(pkg) += , sugar-presence-service-0.90 | sugar-presence-service
 
 # Suppress unneeded auto-resolved build-dependency on python-dev
 CDBS_BUILD_DEPENDS_class_python-sugar_python = python$(cdbs_python_nondefault_version)