diff --git a/debian/control b/debian/control
index f753ce3..8c19241 100644
--- a/debian/control
+++ b/debian/control
@@ -3,26 +3,25 @@ Section: web
 Priority: extra
 Maintainer: Noosfero developers <noosfero-dev@listas.softwarelivre.org>
 Uploaders: Antonio Terceiro <terceiro@colivre.coop.br>
-Build-Depends:
- debhelper (>= 7.0.50~),
- po4a,
- ruby-gettext,
- ruby-sqlite3,
- rake,
- rails3 (>= 3.2.19-1~),
- ruby-rspec,
- ruby-rspec-rails,
- ruby-will-paginate,
- cucumber,
- ruby-cucumber-rails,
- ruby-capybara,
- ruby-database-cleaner,
- ruby-selenium-webdriver,
- ruby-tidy,
- ruby-mocha,
- imagemagick,
- xvfb,
- tango-icon-theme,
+Build-Depends: cucumber,
+               debhelper (>= 7.0.50~),
+               imagemagick,
+               po4a,
+               rails3 (>= 3.2.19-1~),
+               rake,
+               ruby-capybara,
+               ruby-cucumber-rails,
+               ruby-database-cleaner,
+               ruby-gettext,
+               ruby-mocha,
+               ruby-rspec,
+               ruby-rspec-rails,
+               ruby-selenium-webdriver,
+               ruby-sqlite3,
+               ruby-tidy,
+               ruby-will-paginate,
+               tango-icon-theme,
+               xvfb
 Standards-Version: 3.8.4
 Homepage: http://noosfero.org/
 Vcs-Git: git://git.colivre.coop.br/noosfero.git
@@ -31,46 +30,42 @@ Vcs-Browser: http://git.colivre.coop.br/?p=noosfero.git
 Package: noosfero
 Architecture: all
 Pre-Depends: ruby1.8 (>= 1.8.7.358)
-Depends:
- rails3 (>= 3.2.6-1~),
- ruby (>= 1:1.9.3),
- rake,
- ruby-dalli,
- ruby-exception-notification,
- ruby-gettext,
- ruby-fast-gettext,
- ruby-pg,
- ruby-rmagick,
- ruby-redcloth,
- ruby-will-paginate (>= 2.3.12-1~),
- iso-codes,
- ruby-feedparser,
- ruby-daemons,
- thin,
- tango-icon-theme,
- ruby-hpricot,
- ruby-nokogiri,
- ruby-acts-as-taggable-on,
- ruby-progressbar,
- ruby-prototype-rails,
- ruby-rails-autolink,
- memcached,
- ruby-memcache-client,
- ruby-rest-client,
- debconf,
- dbconfig-common,
- adduser,
- exim4 | mail-transport-agent,
-# to minimize upgrade issues:
- ruby-feedparser (>= 0.7-3~),
- ruby-eventmachine (>= 0.12.10-4~),
- ruby-rack (>= 1.4.5-2~),
- ruby-tzinfo (>= 1.1.0-2~),
- ruby-minitest,
- ${misc:Depends}
-Recommends:
- postgresql,
- postgresql-client
+Depends: adduser,
+         dbconfig-common,
+         debconf,
+         exim4 | mail-transport-agent,
+         iso-codes,
+         memcached,
+         rails3 (>= 3.2.6-1~),
+         rake,
+         ruby (>= 1:1.9.3),
+         ruby-acts-as-taggable-on,
+         ruby-daemons,
+         ruby-dalli,
+         ruby-eventmachine (>= 0.12.10-4~),
+         ruby-exception-notification,
+         ruby-fast-gettext,
+         ruby-feedparser,
+         ruby-feedparser (>= 0.7-3~),
+         ruby-gettext,
+         ruby-hpricot,
+         ruby-memcache-client,
+         ruby-minitest,
+         ruby-nokogiri,
+         ruby-pg,
+         ruby-progressbar,
+         ruby-prototype-rails,
+         ruby-rack (>= 1.4.5-2~),
+         ruby-rails-autolink,
+         ruby-redcloth,
+         ruby-rest-client,
+         ruby-rmagick,
+         ruby-tzinfo (>= 1.1.0-2~),
+         ruby-will-paginate (>= 2.3.12-1~),
+         tango-icon-theme,
+         thin,
+         ${misc:Depends}
+Recommends: postgresql, postgresql-client
 Description: free web-based platform for social networks
  Noosfero is a web platform for social and solidarity economy networks with
  blog, e-Porfolios, CMS, RSS, thematic discussion, events agenda and collective
diff --git a/debian/noosfero.install b/debian/noosfero.install
index 38d2f5d..69573ed 100644
--- a/debian/noosfero.install
+++ b/debian/noosfero.install
@@ -1,40 +1,33 @@
-app                               usr/share/noosfero
-db                                usr/share/noosfero
-doc                               usr/share/noosfero
-lib                               usr/share/noosfero
-script                            usr/share/noosfero
-util                              usr/share/noosfero
 Rakefile                          usr/share/noosfero
-vendor                            usr/share/noosfero
-
+app                               usr/share/noosfero
+baseplugins                       usr/share/noosfero
+config.ru                         usr/share/noosfero
 config/application.rb             usr/share/noosfero/config
 config/boot.rb                    usr/share/noosfero/config
 config/environment.rb             usr/share/noosfero/config
 config/environments               usr/share/noosfero/config
 config/initializers               usr/share/noosfero/config
-config/routes.rb                  usr/share/noosfero/config
 config/locales                    usr/share/noosfero/config
-config.ru                         usr/share/noosfero
-
-plugins                           usr/share/noosfero
-baseplugins                       usr/share/noosfero
-
+config/routes.rb                  usr/share/noosfero/config
+db                                usr/share/noosfero
+debian/database.yml.template      usr/share/noosfero/config
 debian/dbinstall                  usr/lib/noosfero
 debian/dbupgrade                  usr/lib/noosfero
-debian/database.yml.template      usr/share/noosfero/config
-
-public                            usr/share/noosfero
-
 debian/default/noosfero           etc/default
-etc/init.d/noosfero               etc/init.d
+debian/noosfero-check-dbconfig    usr/sbin
+debian/noosfero-console           usr/sbin
+debian/noosfero.yml               etc/noosfero
 debian/thin.yml                   etc/noosfero
+doc                               usr/share/noosfero
+doc/noosfero                      usr/share/noosfero/doc
+etc/init.d/noosfero               etc/init.d
 etc/logrotate.d/noosfero          etc/logrotate.d
-debian/noosfero.yml               etc/noosfero
 etc/noosfero/varnish-accept-language.vcl  etc/noosfero
 etc/noosfero/varnish-noosfero.vcl         etc/noosfero
-
+lib                               usr/share/noosfero
 locale                            usr/share/noosfero
-doc/noosfero                      usr/share/noosfero/doc
-
-debian/noosfero-console           usr/sbin
-debian/noosfero-check-dbconfig    usr/sbin
+plugins                           usr/share/noosfero
+public                            usr/share/noosfero
+script                            usr/share/noosfero
+util                              usr/share/noosfero
+vendor                            usr/share/noosfero
--
libgit2 0.21.2