diff --git a/debian/changelog b/debian/changelog
index da2e6ef718b71afcdba20222fbaec0c05d705378..e1626fc905c6c749611c45f43f5919a31b855207 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+scikit-learn (0.4-1) unstable; urgency=low
+
+  * Fresh upstream release:
+    - no boost library used any longer (removed from Build-Depends)
+  * Moving under NeuroDebian umbrella
+
+ -- Yaroslav Halchenko <debian@onerussian.com>  Tue, 29 Jun 2010 09:32:18 -0400
+
 scikit-learn (0.3-4) unstable; urgency=low
 
   * Disabling test_gmm_em unittests while building (Closes: #580879).
diff --git a/debian/control b/debian/control
index e3b5753c341b2b0c7d4847ecd2794001c530ec42..31dcf4612e69fe22100188c0cf3f7e9b6769e1ad 100644
--- a/debian/control
+++ b/debian/control
@@ -1,9 +1,9 @@
 Source: scikit-learn
 Section: python
 Priority: optional
-Maintainer: Experimental Psychology Maintainers <pkg-exppsy-maintainers@lists.alioth.debian.org>
+Maintainer: NeuroDebian Team <team@neuro.debian.net>
 Uploaders: Yaroslav Halchenko <debian@onerussian.com>, Michael Hanke <michael.hanke@gmail.com>
-Build-Depends: debhelper (>= 7.0.50), python-all-dev (>= 2.5), python-support (>= 0.6), python-numpy-ext, python-scipy, libsvm-dev (>= 2.84.0), python-sphinx, graphviz, python-nose, python-setuptools, cython, python-matplotlib, ipython, swig, libboost-dev
+Build-Depends: debhelper (>= 7.0.50), python-all-dev (>= 2.5), python-support (>= 0.6), python-numpy-ext, python-scipy, libsvm-dev (>= 2.84.0), python-sphinx, graphviz, python-nose, python-setuptools, cython, python-matplotlib, ipython, swig
 Standards-Version: 3.8.4
 Homepage: http://scikit-learn.sourceforge.net
 Vcs-Browser: http://github.com/yarikoptic/scikit-learn
diff --git a/debian/patches/deb_use_system_libraries b/debian/patches/deb_use_system_libraries
index 5820e1f77abfddae7faa7535c6012a09ac7cab20..be877ce6a9f41b2b2036fb77dec1957b8c994250 100644
--- a/debian/patches/deb_use_system_libraries
+++ b/debian/patches/deb_use_system_libraries
@@ -1,18 +1,16 @@
 --- a/site.cfg
 +++ b/site.cfg
-@@ -1,8 +1,8 @@
- # uncomment this to compile libraries that depend on boost
--# [boost]
--# use_boost=True
-+[boost]
-+use_boost=True
+@@ -1,9 +1,9 @@
  
+ # Uncomment to link against system-wide libsvm
 -# [libsvm]
 -# libraries=svm
 -# library_dirs=/usr/lib
 -# include_dirs=/usr/include/libsvm-2.0/libsvm
-\ No newline at end of file
 +[libsvm]
 +libraries=svm
 +library_dirs=/usr/lib
 +include_dirs=/usr/include/libsvm-2.0/libsvm
+ 
+ # Uncomment to link against the MKL library on windows
+ # [mkl]
diff --git a/debian/rules b/debian/rules
index 03b53bf57201c3c0488a5b6214c507b639fdaf1a..6be031f3f952025375560172c0c0c4b1ddc9f0a2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -60,4 +60,4 @@ override_dh_compress:
 override_dh_installdocs:
 	: # Use jquery from Debian package, so prune shipped one
 	-rm doc/_build/html/_static/jquery.js
-	dh_installdocs -A AUTHORS README
+	dh_installdocs -A AUTHORS README.rst