diff --git a/build.sh b/build.sh
index f1f06e676..8196fc653 100755
--- a/build.sh
+++ b/build.sh
@@ -2,7 +2,22 @@
 
 # Put installed packages into ./bin
 export GOBIN=$PWD/`dirname $0`/bin
-export FLAGS=""
+
+if [ -d ".git" ] 
+then
+    export BUILD=`git rev-parse --short HEAD || ""`
+    export BRANCH=`(git symbolic-ref --short HEAD | tr -d \/ ) || ""`
+    if [ "$BRANCH" = master ]
+    then
+        export BRANCH=""
+    fi
+
+    export FLAGS="-X github.com/matrix-org/dendrite/internal.branch=$BRANCH -X github.com/matrix-org/dendrite/internal.build=$BUILD"
+else
+    export FLAGS=""
+fi
+
+mkdir -p bin
 
 CGO_ENABLED=1 go build -trimpath -ldflags "$FLAGS" -v -o "bin/" ./cmd/...