diff --git a/debian/changelog b/debian/changelog
index 52f21b37..5bb459e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-scikits-image (0.5.0-1) UNRELEASED; urgency=low
+skimage (0.5.0-1) UNRELEASED; urgency=low
 
   * Initial release. (Closes: #639820)
 
diff --git a/debian/control b/debian/control
index 27a50d7f..71700258 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ 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-numpy, python-sphinx, python-nose, python-setuptools, cython (>= 0.13), python-matplotlib, python-scipy
+Build-Depends: debhelper (>= 7.0.50), python-all-dev (>= 2.6.6-3~), python-numpy, python-sphinx, python-nose, python-setuptools, cython (>= 0.13), python-matplotlib, python-scipy, libfreeimage3, python-imaging
 Standards-Version: 3.9.2
 XS-Python-Version: >= 2.5
 Homepage: http://scikits-image.org
@@ -12,9 +12,9 @@ Vcs-Git: git://github.com/scikits-image/scikits-image.git
 
 Package: python-skimage
 Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, python-numpy, python-scipy, python-skimage-lib (>= ${source:Version})
+Depends: ${misc:Depends}, ${python:Depends}, python-numpy, python-scipy, python-skimage-lib (>= ${source:Version}), libfreeimage3
 Provides: ${python:Provides}
-Recommends: python-nose, python-matplotlib
+Recommends: python-nose, python-matplotlib, python-imaging
 Suggests: python-skimage-doc, python-opencv
 Description: Python modules for image processing
  scikits-image is a collection of image processing algorithms for
diff --git a/debian/rules b/debian/rules
index 6db21fa1..1a445c00 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 # -*- mode: makefile; coding: utf-8 -*-
 
-PACKAGE_NAME = python-scikits.image
+PACKAGE_NAME = python-skimage
 PACKAGE_ROOT_DIR = $(CURDIR)/debian/${PACKAGE_NAME}
 
 PYVERS = $(shell pyversions -vs)
@@ -13,17 +13,12 @@ PYVER = $(shell pyversions  -vd)
 
 override_dh_clean:
 ifeq (,$(filter noclean,$(DEB_BUILD_OPTIONS)))
-	rm -rf build doc/build doc/auto_examples *-stamp scikits.image.egg-info
+	rm -rf build doc/build doc/auto_examples *-stamp skimage.egg-info
 	dh_clean
 endif
 
-# Prune toplevel scikits/__init__.py to avoid conflicts across future
-# scikits- packages, and rely on dh_python to create such one if
-# necessary
-
 # Build docs during install
 override_dh_auto_install: ${PYVERS:%=python-install%}
-	find debian -wholename \*scikits/__init__.py -delete
 
 # Per Python version logic -- install, test, move .so into -lib
 python-install%:
@@ -40,13 +35,13 @@ ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	: # Run unittests
 	export PYTHONPATH=$(PACKAGE_ROOT_DIR)/usr/lib/python$*/dist-packages; \
 	 python$* /usr/bin/nosetests -s \
-	  $(PACKAGE_ROOT_DIR)/usr/lib/python$*/*/scikits/image
+	  $(PACKAGE_ROOT_DIR)/usr/lib/python$*/*-packages/skimage
 else
 	: # Skip unittests due to nocheck
 endif
 
 	: # Move platform-specific libraries into -lib
-	for lib in $$(find $(PACKAGE_ROOT_DIR)/usr -name '*.so'); do \
+	set -e; for lib in $$(find $(PACKAGE_ROOT_DIR)/usr -name '*.so'); do \
 	   sdir=$$(dirname $$lib) ; \
 	   tdir=$(PACKAGE_ROOT_DIR)-lib/$${sdir#*$(PACKAGE_NAME)/} ; \
 	   mkdir -p $$tdir ; \
@@ -58,8 +53,8 @@ endif
 	-rm -f doc/build/html/_static/jquery.js
 	# Actually due to the problems with underscore pkg across releases just ship one for now
 	#-rm -f doc/build/html/_static/underscore.js
-	-rf -f doc/build/html/_sources
-	-rf -f doc/build/html/.buildinfo
+	-rm -rf doc/build/html/_sources
+	-rm -f doc/build/html/.buildinfo
 
 	: # Move documentation to -doc
 	sdir=$(CURDIR)/doc/build/html ; \
@@ -75,4 +70,5 @@ override_dh_compress:
 	dh_compress -X.py -X.html -X.pdf -X.css -X.jpg -X.txt -X.js -X.json -X.rtc
 
 override_dh_installdocs:
-	dh_installdocs -A CONTRIBUTORS.txt README.txt DEVELOPMENT.txt TASKS.txt
+	dh_installdocs -A CONTRIBUTORS.txt README.rst DEVELOPMENT.txt TASKS.txt
+
diff --git a/debian/source/options b/debian/source/options
index fcd9d4f9..e39afd12 100644
--- a/debian/source/options
+++ b/debian/source/options
@@ -1,2 +1,3 @@
 # Do not generate diff for version.py which gets updated by setup.py
-extend-diff-ignore = "(^|/)scikits/image/version.py$"
+extend-diff-ignore = "(^|/)skimage/version.py$"
+