diff -Nru sagemath-8.1/debian/changelog sagemath-8.1/debian/changelog
--- sagemath-8.1/debian/changelog	2017-12-30 11:26:04.000000000 +0000
+++ sagemath-8.1/debian/changelog	2018-02-09 14:41:22.000000000 +0000
@@ -1,3 +1,11 @@
+sagemath (8.1-2+rpi1) buster-staging; urgency=medium
+
+  * Disable testsuite.
+  * Fix clean target.
+  * Add build-depends on python3-rpy2
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Fri, 09 Feb 2018 14:41:22 +0000
+
 sagemath (8.1-2) unstable; urgency=medium
 
   * Upload to unstable.
diff -Nru sagemath-8.1/debian/control sagemath-8.1/debian/control
--- sagemath-8.1/debian/control	2017-12-29 00:36:45.000000000 +0000
+++ sagemath-8.1/debian/control	2018-02-09 14:41:22.000000000 +0000
@@ -202,6 +202,7 @@
  scons,
  texlive-latex-base,
  zlib1g-dev,
+ python3-rpy2,
 
 Package: sagemath
 Architecture: any
diff -Nru sagemath-8.1/debian/control.in sagemath-8.1/debian/control.in
--- sagemath-8.1/debian/control.in	2017-12-29 00:35:56.000000000 +0000
+++ sagemath-8.1/debian/control.in	2018-02-09 14:41:22.000000000 +0000
@@ -78,6 +78,7 @@
  scons,
  texlive-latex-base,
  zlib1g-dev,
+ python3-rpy2,
 
 Package: sagemath
 Architecture: any
diff -Nru sagemath-8.1/debian/rules sagemath-8.1/debian/rules
--- sagemath-8.1/debian/rules	2017-11-11 01:39:47.000000000 +0000
+++ sagemath-8.1/debian/rules	2018-02-09 14:41:22.000000000 +0000
@@ -168,6 +168,8 @@
 else
 	dh_auto_clean -Dsage -- maintainer-clean
 endif
+	rm -f `find . -name '*.pyc'`
+	rm -rf debian/build
 
 override_dh_install-indep: $(DOCS_INSTALL) $(DOCS_DOC_BASE) $(DOCS_OVERRIDES)
 	dh_install --package sagemath-common -X.so
@@ -276,14 +278,14 @@
 	fi
 
 override_dh_auto_test-arch:
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+ifeq (testsuitedisabled,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	# TODO: exclude src/sage/misc/sagedoc.py, this will cause ~7 failures if we don't build the docs
 	$(call run_tests_with_retry,arch,src/sage /usr/lib/python2.7/dist-packages/sagenb/)
 endif
 
 override_dh_auto_test-indep:
 ifeq (,$(filter nodoc,$(DEB_BUILD_OPTIONS)))
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+ifeq (testsuitedisabled,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	# These tests never fail so don't bother with the retry logic
 	$(call run_tests,indep,src/doc src/sage/misc/sagedoc.py)
 	# Sometimes, parts of the docbuild fail with MemoryError or OSError but