diff --git a/packages/common.mk b/packages/common.mk
index a481c3a..ec069b0 100644
--- a/packages/common.mk
+++ b/packages/common.mk
@@ -65,9 +65,13 @@ $(patsubst %.json,%.jq,${INFO_FILE}):
 
 # Helpers
 %/: %.tar.gz
-	cd ${BUILD_DIR} && tar xzf $(patsubst ${BUILD_DIR}%,%,$<)
+	mkdir -p $@
+	tar xzf $< --strip-components=1 -C $@
 %/: %.tar.xz
-	cd ${BUILD_DIR} && tar xf $(patsubst ${BUILD_DIR}%,%,$<)
-
+	mkdir -p $@
+	tar xf $< --strip-components=1 -C $@
+%/: %.zip
+	mkdir -p $@
+	unzip $< -d $@
 %.json: %.jq
 	jq '$(shell tr '\n' '|' < $<).' <<< "{}" > $@
\ No newline at end of file