diff --git a/configure.ac b/configure.ac
index 2720c58e22..5f587a7277 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2007,9 +2007,15 @@
           CFLAGS="${CFLAGS} -I../rust/gen/c-headers"
           AC_SUBST(RUST_SURICATA_LIB)
           AC_SUBST(RUST_LDADD)
+	  AC_SUBST([CARGO], [$HAVE_CARGO])
+	  if test "x$CARGO_HOME" = "x"; then
+	    AC_SUBST([CARGO_HOME], [~/.cargo])
+	  else
+	    AC_SUBST([CARGO_HOME], [$CARGO_HOME])
+	  fi
           AC_CHECK_FILES([$srcdir/rust/vendor], [have_rust_vendor="yes"])
           if test "x$have_rust_vendor" = "xyes"; then
-	        rust_vendor_comment=""
+	    rust_vendor_comment=""
           fi
         fi
       fi
diff --git a/rust/Makefile.am b/rust/Makefile.am
index 8b67c7bed3..9cf6eec83e 100644
--- a/rust/Makefile.am
+++ b/rust/Makefile.am
@@ -29,15 +29,17 @@ all-local:
 if HAVE_PYTHON
 	cd $(top_srcdir)/rust && CARGO_TARGET_DIR=$(abs_builddir)/target \
 		$(HAVE_PYTHON) ./gen-c-headers.py && \
-		cargo build $(RELEASE) $(FROZEN) --features "$(FEATURES)"
+		CARGO_HOME=$(CARGO_HOME) $(CARGO) build $(RELEASE) $(FROZEN) \
+			--features "$(FEATURES)"
 else
 	cd $(top_srcdir)/rust && CARGO_TARGET_DIR=$(abs_builddir)/target \
-		cargo build $(RELEASE) $(FROZEN) --features "$(FEATURES)"
+		CARGO_HOME=$(CARGO_HOME) $(CARGO) build $(RELEASE) $(FROZEN) \
+			--features "$(FEATURES)"
 endif
 
 clean-local:
 	cd $(top_srcdir)/rust && CARGO_TARGET_DIR=$(abs_builddir)/target \
-		cargo clean
+		CARGO_HOME=$(CARGO_HOME) $(CARGO) clean
 
 distclean-local:
 	rm -rf vendor
@@ -45,14 +47,14 @@ distclean-local:
 
 check:
 	cd $(top_srcdir)/rust && CARGO_TARGET_DIR=$(abs_builddir)/target \
-		cargo test
+		CARGO_HOME=$(CARGO_HOME) $(CARGO) test
 
 Cargo.lock: Cargo.toml
-	cargo update
+	CARGO_HOME=$(CARGO_HOME) $(CARGO) update
 
 if HAVE_CARGO_VENDOR
 vendor:
-	cargo vendor > /dev/null
+	CARGO_HOME=$(CARGO_HOME) $(CARGO) vendor > /dev/null
 else
 vendor:
 endif