diff --git a/DESCRIPTION b/DESCRIPTION
index a1a2370..2c9c0df 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: gifski
 Type: Package
 Title: Highest Quality GIF Encoder
-Version: 0.8.6
+Version: 0.8.6.1
 Authors@R: c(
     person("Jeroen", "Ooms", ,"jeroen@berkeley.edu", role = c("aut", "cre"),
       comment = c(ORCID = "0000-0002-4035-0289")),
diff --git a/configure b/configure
index 7b7a7de..dcdaf09 100755
--- a/configure
+++ b/configure
@@ -8,6 +8,13 @@ if [ $? -eq 0 ]; then
   VERSION=$($CARGO --version)
   echo "Using $CARGO ($VERSION)"
   sed -e "s|@cargobin@|$CARGO|" src/Makevars.in > src/Makevars
+
+  # CRAN forbids using $HOME during CMD check; try to override CARGO_HOME
+  if [ "$CARGO" == "/usr/bin/cargo" ] && [ "$_R_CHECK_SIZE_OF_TARBALL_" ]; then
+    if [ -z "$CARGO_HOME" ] && [ ! -e "$HOME/.cargo" ]; then
+      sed -i.bak "s|#export|export|" src/Makevars
+    fi
+  fi
   exit 0
 fi
 
diff --git a/src/Makevars.in b/src/Makevars.in
index fd66959..4b6ad27 100644
--- a/src/Makevars.in
+++ b/src/Makevars.in
@@ -4,6 +4,9 @@ PKG_CFLAGS = -pthread $(C_VISIBILITY)
 PKG_LIBS = -L$(LIBDIR) -lmyrustlib -lresolv -pthread
 CARGO = @cargobin@
 
+# CRAN policy forbids using $HOME
+#export CARGO_HOME=$(R_PACKAGE_DIR)
+
 #all: clean
 
 $(SHLIB): $(STATLIB)