diff --git a/debian/changelog b/contrib/packages/debian/changelog
similarity index 100%
rename from debian/changelog
rename to contrib/packages/debian/changelog
diff --git a/debian/compat b/contrib/packages/debian/compat
similarity index 100%
rename from debian/compat
rename to contrib/packages/debian/compat
diff --git a/debian/control b/contrib/packages/debian/control
similarity index 100%
rename from debian/control
rename to contrib/packages/debian/control
diff --git a/debian/copyright b/contrib/packages/debian/copyright
similarity index 100%
rename from debian/copyright
rename to contrib/packages/debian/copyright
diff --git a/debian/pyversions b/contrib/packages/debian/pyversions
similarity index 100%
rename from debian/pyversions
rename to contrib/packages/debian/pyversions
diff --git a/debian/rules b/contrib/packages/debian/rules
similarity index 100%
rename from debian/rules
rename to contrib/packages/debian/rules
diff --git a/debian/source/format b/contrib/packages/debian/source/format
similarity index 100%
rename from debian/source/format
rename to contrib/packages/debian/source/format
diff --git a/debian/source/options b/contrib/packages/debian/source/options
similarity index 100%
rename from debian/source/options
rename to contrib/packages/debian/source/options
diff --git a/debian/watch b/contrib/packages/debian/watch
similarity index 100%
rename from debian/watch
rename to contrib/packages/debian/watch
diff --git a/docs/source/GetStartedGuide.rst b/docs/source/GetStartedGuide.rst
index 7775e75faa..cd32c4735b 100644
--- a/docs/source/GetStartedGuide.rst
+++ b/docs/source/GetStartedGuide.rst
@@ -9,14 +9,15 @@ The first step towards using Avocado is, quite obviously, installing it.
 Installing Avocado
 ==================
 
-Avocado is available in RPM packages for Fedora, and `DEB packages for Ubuntu`_.
-
-.. _DEB packages for Ubuntu: https://launchpad.net/~lmr/+archive/avocado
+Avocado is officially available in RPM packages for Fedora and
+Enterprise Linux.  Other RPM based distributions may package and ship
+Avocado themselves.  DEB package support is available in the source
+tree (look at the ``contrib/packages/debian`` directory).
 
 .. Note: the following text should instead reference the distro tiers levels
 
 Avocado is primarily being developed on Fedora, but reasonable efforts
-are being made to support other platforms such as Ubuntu.
+are being made to support other GNU/Linux based platforms.
 
 Fedora
 ------
@@ -38,16 +39,6 @@ such as CentOS, just adapt to the following URL and commands::
     sudo curl https://repos-avocadoproject.rhcloud.com/static/avocado-el.repo -o /etc/yum.repos.d/avocado.repo
     sudo yum install avocado
 
-
-Ubuntu
-------
-
-You can install Avocado by running the following commands::
-
-    sudo echo "deb http://ppa.launchpad.net/lmr/avocado/ubuntu utopic main" >> /etc/apt/sources.list
-    sudo apt-get update
-    sudo apt-get install avocado
-
 Generic installation from a GIT repository
 ------------------------------------------