diff --git a/Makefile b/Makefile
index 48c561f..162176f 100644
--- a/Makefile
+++ b/Makefile
@@ -114,7 +114,7 @@ host_pinvoke: host_pinvoke_release host_pinvoke_debug
 host: host_debug host_release
 
 # Build every target available on this host
-all: host host_jar macos ios android
+all: host host_pinvoke host_jar macos ios android
 	$(DIST_BUILD_SCRIPT) display
 
 # [For distribution process only] Prepare remote builds
diff --git a/dist.sh b/dist.sh
index a30efdf..27b7025 100755
--- a/dist.sh
+++ b/dist.sh
@@ -282,7 +282,7 @@ host_pinvoke()
 	BIN_OUTPUT_DIR=$(pwd)/bin/$1/${NORMALIZED_OSNAME}-$(uname -m)
 	mkdir -p $BIN_OUTPUT_DIR
 	rm -rf $BIN_OUTPUT_DIR/*
-	LIB_OUTPUT_DIR=$(pwd)/lib/$1/${NORMALIZED_OSNAME}-$(uname -m)
+	LIB_OUTPUT_DIR=$(pwd)/lib/$1/${NORMALIZED_OSNAME}-$(uname -m)-pinvoke
 	mkdir -p $LIB_OUTPUT_DIR
 	rm -rf $LIB_OUTPUT_DIR/libzt.a $LIB_OUTPUT_DIR/$DYNAMIC_LIB_NAME $LIB_OUTPUT_DIR/libztcore.a
 	# Build