diff --git a/.travis.sh b/.travis.sh
index b2ac4fdd61f..ee8fcb5925c 100755
--- a/.travis.sh
+++ b/.travis.sh
@@ -4,6 +4,9 @@ BRANCH=$(git rev-parse --abbrev-ref HEAD)
 REVISION=$(git rev-parse --short HEAD)
 LAST_COMMIT_DATE=$(git log -1 --date=short --format="%cd")
 TARGET_FILE=obj/cleanflight_${TARGET}
+REPONAME=${TRAVIS_REPO_SLUG:=$USER/undefined}
+BUILDNAME=${BUILDNAME:=travis}
+
 
 # A hacky way of running the unit tests at the same time as the normal builds.
 if [ $RUNTESTS ] ; then
@@ -14,12 +17,12 @@ elif [ $PUBLISHDOCS ] ; then
 	if [ $PUBLISH_URL ] ; then
 
 		sudo apt-get install zlib1g-dev libssl-dev wkhtmltopdf libxml2-dev libxslt-dev #ruby-rvm
-		
+
 		# Patch Gimli to fix underscores_inside_words
 		curl -L https://github.com/walle/gimli/archive/v0.5.9.tar.gz | tar zxf -
-		
+
 		sed -i 's/).render(/, :no_intra_emphasis => true).render(/' gimli-0.5.9/ext/github_markup.rb
-		
+
 		cd gimli-0.5.9/
 		gem build gimli.gemspec && rvmsudo gem install gimli
 		cd ../
@@ -32,6 +35,8 @@ elif [ $PUBLISHDOCS ] ; then
 			--form "branch=${BRANCH}" \
 			--form "last_commit_date=${LAST_COMMIT_DATE}" \
 			--form "travis_build_number=${TRAVIS_BUILD_NUMBER}" \
+			--form "github_repo=${REPONAME}" \
+			--form "build_name=${BUILDNAME}" \
 			${PUBLISH_URL}
 	fi
 
@@ -44,6 +49,8 @@ elif [ $PUBLISHMETA ] ; then
 			--form "branch=${BRANCH}" \
 			--form "last_commit_date=${LAST_COMMIT_DATE}" \
 			--form "travis_build_number=${TRAVIS_BUILD_NUMBER}" \
+			--form "github_repo=${REPONAME}" \
+			--form "build_name=${BUILDNAME}" \
 			${PUBLISH_URL}
 	fi
 
@@ -58,16 +65,17 @@ else
 			echo "build artifact (hex or bin) for ${TARGET_FILE} not found, aborting";
 			exit 1
 		fi
-	
+
 		curl -k \
 			--form "file=@${TARGET_FILE}" \
 			--form "revision=${REVISION}" \
 			--form "branch=${BRANCH}" \
 			--form "last_commit_date=${LAST_COMMIT_DATE}" \
 			--form "travis_build_number=${TRAVIS_BUILD_NUMBER}" \
+			--form "github_repo=${REPONAME}" \
+			--form "build_name=${BUILDNAME}" \
 			${PUBLISH_URL}
 	else
 		make -j2
 	fi
 fi
-
diff --git a/fake_travis_build.sh b/fake_travis_build.sh
index da538df30dc..a6db4d462d6 100755
--- a/fake_travis_build.sh
+++ b/fake_travis_build.sh
@@ -6,8 +6,10 @@ targets=("PUBLISHMETA=True" "RUNTESTS=True" \
 "TARGET=OLIMEXINO" "TARGET=PORT103R" "TARGET=SPARKY" "TARGET=STM32F3DISCOVERY" \
 "TARGET=ALIENWIIF1" "TARGET=ALIENWIIF3")
 
-#fake a travis build number
+#fake a travis build environment
 export TRAVIS_BUILD_NUMBER=$(date +%s)
+export BUILDNAME=fake_travis
+export TRAVIS_REPO_SLUG=$USER/simulated
 
 for target in "${targets[@]}"
 do
@@ -16,6 +18,3 @@ do
 	make clean
 	./.travis.sh
 done
-
-
-
diff --git a/support/buildserver/upload.php b/support/buildserver/upload.php
index 9e507e91e7d..ef9fd306abd 100755
--- a/support/buildserver/upload.php
+++ b/support/buildserver/upload.php
@@ -1,4 +1,4 @@
-<?
+<?php
 	// see docs/Travis.md, .travis.sh
 
 	$baseDir = "/var/www/builds/";
@@ -12,8 +12,11 @@
 	$revision = sanitize($_POST["revision"]);
 	$branch = sanitize($_POST["branch"]);
 
-	$uploadDir = $baseDir . "/" . $lastCommitDate . "/";
-	$prefix = $uploadDir . $travisJobId . "_" . $revision;
+	$github_repo = sanitize($_POST["github_repo"]);
+	$build_name = sanitize($_POST["build_name"]);
+
+	$uploadDir = $baseDir . "/" . $github_repo . "/" . $lastCommitDate . "/";
+	$prefix = $uploadDir . $travisJobId . "_" . $revision . "_" . $build_name;
 
 	if(!file_exists($uploadDir)) mkdir($uploadDir, 0770, true);