diff --git a/debian/control b/debian/control
index 147a25f13..3926f72f9 100644
--- a/debian/control
+++ b/debian/control
@@ -1,12 +1,12 @@
-Source: moulinette-yunohost
-Section: net
+Source: yunohost
+Section: utils
 Priority: extra
 Maintainer: YunoHost Contributors <contrib@yunohost.org>
 Build-Depends: debhelper (>=9), dh-systemd
 Standards-Version: 3.9.6
 Homepage: https://yunohost.org/
 
-Package: moulinette-yunohost
+Package: yunohost
 Architecture: all
 Depends: ${misc:Depends}, ${shlibs:Depends},
  moulinette (>= 2.2.1),
@@ -14,7 +14,7 @@ Depends: ${misc:Depends}, ${shlibs:Depends},
  python-requests,
  glances,
  python-pip,
- pyminiupnpc,
+ python-miniupnpc | pyminiupnpc,
  dnsutils,
  bind9utils,
  python-apt,
@@ -26,8 +26,21 @@ Depends: ${misc:Depends}, ${shlibs:Depends},
  git-core,
  curl,
  mariadb-server | mysql-server, php5-mysql | php5-mysqlnd
+ slapd, ldap-utils, sudo-ldap, libnss-ldapd,
+ postfix-ldap, postfix-policyd-spf-perl, postfix-pcre, postgrey,
+ dovecot-ldap, dovecot-lmtpd, dovecot-managesieved,
+ amavisd-new, razor, pyzor, dovecot-antispam, spamassassin, fail2ban,
+ nginx-extras (>=1.6.2), php5-fpm, php5-ldap, php5-intl,
+ dnsmasq, openssl, avahi-daemon,
+ ssowat, metronome
+Recommends: yunohost-admin,
+ bash-completion, rsyslog, ntp, openssh-server,
+ php5-gd, php5-curl, php-gettext, php5-mcrypt,
+ udisks-glue, unattended-upgrades,
+ libdbd-ldap-perl, libnet-dns-perl
+Suggests: htop, vim, rsync, acpi-support-base
 Conflicts: iptables-persistent
-Description: YunoHost scripts for the moulinette
+Description: YunoHost installation package
  YunoHost aims to make self-hosting accessible to everyone.
  .
  This package contains YunoHost scripts and binaries to be used by the