diff --git a/debian/changelog b/debian/changelog
index 6ebf06b26c988fb04eb7e1f383c857020029e15e..7e8847008a275d74914cc77b9dd34504287543a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+scikit-learn (0.7.1.dfsg-3) unstable; urgency=low
+
+  * Do not build documentation in -a mode, to prevent timeouts on buildd
+    servers
+
+ -- Yaroslav Halchenko <debian@onerussian.com>  Wed, 13 Apr 2011 16:27:14 -0400
+
 scikit-learn (0.7.1.dfsg-2) unstable; urgency=low
 
   * Upload to unstable
diff --git a/debian/rules b/debian/rules
index 733f9cf305007be274d12183ec68bedf1b517884..164ec6eeab5d6582f36be27c3bb525e16ca8f430 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,9 +38,13 @@ endif
 override_dh_installdocs:
 	: # Build Documentation using installed scikits.learn
 ifeq (,$(filter nodoc,$(DEB_BUILD_OPTIONS)))
+ifneq (,$(findstring -a,$(DH_INTERNAL_OPTIONS)))
+	: # not building documentation in -a
+else
 	export PYTHONPATH=`/bin/ls -d $$PWD/$(PACKAGE_ROOT_DIR)/usr/lib/python$(PYVER)/*`; \
 	export MPLCONFIGDIR=$(CURDIR)/build HOME=$(CURDIR)/build; \
 	 cd doc; $(MAKE) html
+endif
 endif
 	: # Use jquery from Debian package, so prune shipped one
 	-rm doc/_build/html/_static/jquery.js