diff --git a/debian/changelog b/debian/changelog
index c8ff9982..9094c60a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ skimage (0.8.2-2) UNRELEASED; urgency=low
   * update packaging to use dh_sphinxdoc and dh_python2
     requires search-html.patch to fix file so dh_sphinxdoc recognises it
   * fix-doc-links.patch: fix navbar links in documentation
+  * wrap-and-sort debian/
 
- -- Julian Taylor <jtaylor.debian@googlemail.com>  Mon, 10 Jun 2013 21:18:24 +0200
+ -- Julian Taylor <jtaylor.debian@googlemail.com>  Mon, 10 Jun 2013 21:19:18 +0200
 
 skimage (0.8.2-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 37f2ac63..f95429df 100644
--- a/debian/control
+++ b/debian/control
@@ -3,16 +3,17 @@ Section: python
 Priority: optional
 Maintainer: Stefan van der Walt <stefan@sun.ac.za>
 Uploaders: Yaroslav Halchenko <debian@onerussian.com>
-Build-Depends: debhelper (>= 7.0.50),
-               python-all-dev (>= 2.6.6-3~), python-setuptools,
+Build-Depends: cython (>= 0.15),
+               debhelper (>= 7.0.50),
+               libfreeimage3,
+               python-all-dev (>= 2.6.6-3~),
+               python-imaging,
+               python-matplotlib (>= 1.0),
+               python-nose,
                python-numpy,
                python-scipy (>= 0.10),
-               python-sphinx (>= 1.0.7+dfsg-1~),
-               python-nose,
-               cython (>= 0.15),
-               python-matplotlib (>= 1.0),
-               libfreeimage3,
-               python-imaging
+               python-setuptools,
+               python-sphinx (>= 1.0.7+dfsg-1~)
 Standards-Version: 3.9.4
 X-Python-Version: >= 2.6
 Homepage: http://scikits-image.org
@@ -22,13 +23,14 @@ XS-Testsuite: autopkgtest
 
 Package: python-skimage
 Architecture: all
-Depends: ${misc:Depends}, ${python:Depends},
+Depends: libfreeimage3,
          python-numpy,
          python-scipy (>= 0.10),
          python-skimage-lib (>= ${source:Version}),
-         libfreeimage3,
-Recommends: python-nose, python-matplotlib (>= 1.0), python-imaging, python-qt4
-Suggests: python-skimage-doc, python-opencv
+         ${misc:Depends},
+         ${python:Depends}
+Recommends: python-imaging, python-matplotlib (>= 1.0), python-nose, python-qt4
+Suggests: python-opencv, python-skimage-doc
 Description: Python modules for image processing
  scikits-image is a collection of image processing algorithms for
  Python.  It performs tasks such as image loading, filtering,
@@ -45,7 +47,7 @@ Description: Documentation and examples for scikits-image
 
 Package: python-skimage-lib
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, ${python:Depends}, python-numpy
+Depends: python-numpy, ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}
 Recommends: python-skimage
 Description: Optimized low-level algorithms for scikits-image
  This is an add-on package for python-skimage. It provides