diff --git a/Makefile b/Makefile
index 12cf1b67df..c222321718 100644
--- a/Makefile
+++ b/Makefile
@@ -390,12 +390,11 @@ offline-tar-build/$(DIST_FULL):
 
 # TODO - Somehow share implementation with setup_tarball
 offline-tar-build/$(DIST_FULL)/$(OFFLINE_TAR_FILE):
-	cp -a setup offline-tar-build/$(SETUP_TAR_NAME)
-	cd offline-tar-build/$(SETUP_TAR_NAME) && sed -e 's#%NAME%#$(NAME)#;s#%VERSION%#$(VERSION)#;s#%RELEASE%#$(RELEASE)#;' group_vars/all.in > group_vars/all
-	cd offline-tar-build && tar -czf $(SETUP_TAR_FILE) --exclude "*/all.in" $(SETUP_TAR_NAME)/
-	ln -sf $(SETUP_TAR_FILE) offline-tar-build/$(SETUP_TAR_LINK)
+	cp -a setup offline-tar-build/$(DIST_FULL)/$(OFFLINE_TAR_NAME)
+	cd offline-tar-build/$(DIST_FULL)/$(OFFLINE_TAR_NAME) && sed -e 's#%NAME%#$(NAME)#;s#%VERSION%#$(VERSION)#;s#%RELEASE%#$(RELEASE)#;' group_vars/all.in > group_vars/all
 	$(PYTHON) $(DEPS_SCRIPT) -d $(DIST) -r $(DIST_MAJOR) -u $(AW_REPO_URL) -s offline-tar-build/$(DIST_FULL)/$(OFFLINE_TAR_NAME) -v -v -v
-	cd offline-tar-build/$(DIST_FULL) && tar -czf $(OFFLINE_TAR_FILE) $(OFFLINE_TAR_NAME)/
+	cd offline-tar-build/$(DIST_FULL) && tar -czf $(OFFLINE_TAR_FILE) --exclude "*/all.in" $(OFFLINE_TAR_NAME)/
+	ln -sf $(OFFLINE_TAR_FILE) offline-tar-build/$(DIST_FULL)/$(OFFLINE_TAR_LINK)
 
 setup_offline_tarball: offline-tar-build offline-tar-build/$(DIST_FULL) offline-tar-build/$(DIST_FULL)/$(OFFLINE_TAR_FILE)
 	@echo "#############################################"