diff --git a/build/jam/CommandLineArguments b/build/jam/CommandLineArguments
index bb0aab796b..79c7f9e46a 100644
--- a/build/jam/CommandLineArguments
+++ b/build/jam/CommandLineArguments
@@ -66,11 +66,11 @@ rule ProcessCommandLineArguments
 				}
 			}
 
-			# Copy the given set of local package files to the remote repository
-			# and create a new version of that remote repository.
-			case build-remote-repository : {
-				BuildRemoteHaikuPortsRepository $(JAM_TARGETS[1])
-					: $(JAM_TARGETS[2-]) ;
+			# Copy the given set of local package files to the git repository
+			# server, where they will be used for creating a new repository
+			# during the push hook.
+			case upload-packages : {
+				UploadPackages $(JAM_TARGETS[1]) : $(JAM_TARGETS[2-]) ;
 				JAM_TARGETS = $(JAM_TARGETS[1]) ;
 				NotFile $(JAM_TARGETS) ;
 				Always $(JAM_TARGETS) ;
diff --git a/build/jam/RepositoryRules b/build/jam/RepositoryRules
index a7f358f7e2..673a1af6dd 100644
--- a/build/jam/RepositoryRules
+++ b/build/jam/RepositoryRules
@@ -626,19 +626,19 @@ EOF
 }
 
 
-rule BuildRemoteHaikuPortsRepository target : packages
+rule UploadPackages target : packages
 {
 	local packageListFile = <repository-package-list>HaikuPorts-packages ;
 	Depends $(target) : $(packageListFile) ;
 	
 	HAIKU_REMOTE_REPOSITORY_PACKAGES on $(target) = $(packages) ;
-	BuildRemoteHaikuPortsRepository1 $(target) : $(packageListFile) ;
+	UploadPackages1 $(target) : $(packageListFile) ;
 }
 
 
-actions BuildRemoteHaikuPortsRepository1
+actions UploadPackages1
 {
-	remote=haiku_files@haiku-files.org
+	remote=git.haiku-os.org
 	
 	if [ -n "$(HAIKU_REMOTE_REPOSITORY_PACKAGES:E=:J)" ]; then
 		for package in $(HAIKU_REMOTE_REPOSITORY_PACKAGES) ; do
@@ -648,14 +648,7 @@ actions BuildRemoteHaikuPortsRepository1
 				exit 1
 			fi 
 		done
-		scp $(HAIKU_REMOTE_REPOSITORY_PACKAGES) \
-			$remote:haiku-files.org/files/hpkg/
+		ssh $remote mkdir -p 'hpkg-upload'
+		scp $(HAIKU_REMOTE_REPOSITORY_PACKAGES) $remote:hpkg-upload/
 	fi
-
-	packageList=package-list.$(TARGET_PACKAGING_ARCH)		
-	scp $(2) $remote:build_repository/$packageList
-	
-	ssh $remote \
-		"cd build_repository \
-			&& ./build_repo.sh $(TARGET_PACKAGING_ARCH) $packageList"
 }