diff --git a/debian/changelog b/debian/changelog
index 13dedd6ce5c..b2fd874fa35 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+openerp-server (6.0.0~rc2-0) experimental; urgency=low
+
+  * Upgrade to 6.0.0-rc2, let it build
+
+ -- P. Christeas <xrg@openerp.com>  Mon, 17 Jan 2011 14:18:00 +0100
+
 openerp-server (5.0.14-1) experimental; urgency=low
 
   * Updating to standards version 3.9.1.
diff --git a/debian/control b/debian/control
index 22be0f04638..0eb6cfd55ee 100644
--- a/debian/control
+++ b/debian/control
@@ -1,28 +1,30 @@
 Source: openerp-server
 Section: net
 Priority: optional
-Maintainer: Debian Open Object Maintainers <open-object@lists.debian-maintainers.org>
-Uploaders: Daniel Baumann <daniel@debian.org>
-Build-Depends: debhelper (>= 7.0.50~), python, quilt (>= 0.46-7)
+Maintainer: OpenERP SA. <xrg@openerp.com>
+Uploaders: Xrg <xrg@openerp.com>
+Build-Depends: debhelper (>= 7.0.50~), python
 Build-Depends-Indep:
  python-libxslt1, python-lxml, python-pychart, python-pydot, python-psycopg2,
  python-reportlab
 Standards-Version: 3.9.1
 Homepage: http://www.openerp.com/
-Vcs-Browser: http://git.debian-maintainers.org/?p=open-object/openerp-server.git
-Vcs-Git: git://git.debian-maintainers.org/git/open-object/openerp-server.git
+Vcs-Browser: http://git.hellug.gr/?p=xrg/openobject-server;a=summary
+Vcs-Git: http://members.hellug.gr/xrg/repos/openobject-server
+Vcs-Bzr: https://code.launchpad.net/openobject-server
 
 Package: openerp-server
 Section: net
 Architecture: all
 Depends:
  ${misc:Depends}, adduser, python,  python-libxslt1, python-lxml,
- python-psycopg2, python-pydot, python-pychart, python-reportlab, python-tz
+ python-psycopg2, python-pydot, python-pychart, python-reportlab, python-tz,
+ python-pyparsing, python-yaml, python-mako, postgresql-client (>= 8.4)
 Conflicts: tinyerp-server
 Replaces: tinyerp-server
 Recommends:
- graphviz, ghostscript, postgresql, postgresql-client, python-imaging,
- python-matplotlib, python-openssl, python-pyparsing
+ graphviz, ghostscript, postgresql, python-imaging,
+ python-matplotlib
 Suggests: openerp-client
 Description: Enterprise Resource Management (server)
  Open ERP, previously known as TinyERP, is a complete ERP and CRM. The main
@@ -34,3 +36,4 @@ Description: Enterprise Resource Management (server)
  .
  This package contains the Open ERP server, install openerp-client package for
  the client.
+
diff --git a/debian/rules b/debian/rules
index 62b338218be..b388a72fce6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 %:
-	dh --with quilt ${@}
+	dh  ${@}
 
 override_dh_auto_clean:
 	dh_auto_clean
@@ -9,7 +9,15 @@ override_dh_auto_clean:
 	rm -rf build
 
 override_dh_auto_install:
-	NO_CHECK_MODULES=1 python setup.py install --install-layout=deb --no-compile --prefix=$(CURDIR)/debian/openerp-server/usr
+	# Adding ALL addons to the server package
+	if [ -d ../addons ] ; then \
+	    pushd ../addons ; \
+		echo > server_modules.list ; \
+	        for ADD_DIR in * ; do \
+	            [ -d "$$ADD_DIR" ] && [ -r "$$ADD_DIR"/__openerp__.py ] && echo "$$ADD_DIR" >> server_modules.list ; \
+		done ; \
+	    popd ; fi
+	NO_CHECK_MODULES=1 python setup.py install --install-layout=deb --no-compile --root=$(CURDIR)/debian/openerp-server
 
 	# Adjusting program location
 	sed -i -e 's|cd .*|cd /usr/share/pyshared/openerp-server|' debian/openerp-server/usr/bin/openerp-server