diff --git a/debian/matlab-spm8.postinst b/debian/matlab-spm8.postinst
index d11eb3f..ab1258a 100644
--- a/debian/matlab-spm8.postinst
+++ b/debian/matlab-spm8.postinst
@@ -3,9 +3,8 @@ set -e
 
 case "$1" in
     configure)
-        debian-matlab-mexhelper spm8 'make MEXBIN="matlab-mex"' \
-            --clean-cmd "make distclean" \
-            --install-cmd "make install DESTDIR=/usr/share/spm8"
+        debian-matlab-mexhelper spm8 install \
+            --build-cmd 'make MEXBIN="matlab-mex"'
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/debian/matlab-spm8.prerm b/debian/matlab-spm8.prerm
index a1b2ee4..6163ba2 100644
--- a/debian/matlab-spm8.prerm
+++ b/debian/matlab-spm8.prerm
@@ -1,15 +1,18 @@
 #!/bin/sh
 set -e
 
-for m in /usr/lib/spm8/*.mex?*; do
-	mbase=$(basename $m)
-	# remove symlink
-	rm -f /usr/share/spm8/$mbase
-	# and actual file
-	rm -f /usr/lib/spm8/$mbase
-done
-
-# try removing the libdir, but don't fail if not empty
-rmdir --ignore-fail-on-non-empty /usr/lib/spm8
+case "$1" in
+    remove|upgrade|deconfigure)
+        debian-matlab-mexhelper spm8 clean
+    ;;
+
+    failed-upgrade)
+    ;;
+
+    *)
+        echo "prerm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
 
 #DEBHELPER#