diff --git a/.appveyor.yml b/.appveyor.yml
index 22b01411e..251d4bee8 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -39,8 +39,7 @@ install:
   - CD ..
 
   # install and build go-libp2p-daemon
-  - curl -O -L -s -S https://raw.githubusercontent.com/status-im/nimbus-build-system/master/scripts/build_p2pd.sh
-  - bash build_p2pd.sh p2pdCache v0.2.4
+  - bash scripts/build_p2pd.sh p2pdCache v0.2.4
 
 build_script:
   - nimble install -y --depsOnly
diff --git a/.travis.yml b/.travis.yml
index faef01911..8fc1f77fa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -45,8 +45,7 @@ install:
   - export PATH="$PWD/Nim/bin:$GOPATH/bin:$PATH"
 
   # install and build go-libp2p-daemon
-  - curl -O -L -s -S https://raw.githubusercontent.com/status-im/nimbus-build-system/master/scripts/build_p2pd.sh
-  - bash build_p2pd.sh p2pdCache v0.2.4
+  - bash scripts/build_p2pd.sh p2pdCache v0.2.4
 
 script:
   - nimble install -y --depsOnly
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 98ced1265..e22b16580 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -104,9 +104,8 @@ steps:
       export PATH="${GOPATH}/bin:${PATH}"
       echo "PATH=${PATH}"
 
-      curl -OLsS https://raw.githubusercontent.com/status-im/nimbus-build-system/master/scripts/build_p2pd.sh
       # we can't seem to be able to build a 32-bit p2pd
-      env PATH="/c/custom/mingw64/bin:${PATH}" bash build_p2pd.sh p2pdCache v0.2.4
+      env PATH="/c/custom/mingw64/bin:${PATH}" bash scripts/build_p2pd.sh p2pdCache v0.2.4
 
       # install dependencies
       nimble refresh
diff --git a/scripts/build_p2pd.sh b/scripts/build_p2pd.sh
new file mode 100644
index 000000000..fedaed961
--- /dev/null
+++ b/scripts/build_p2pd.sh
@@ -0,0 +1,98 @@
+#!/bin/bash
+
+# Copyright (c) 2018-2020 Status Research & Development GmbH. Licensed under
+# either of:
+# - Apache License, version 2.0
+# - MIT license
+# at your option. This file may not be copied, modified, or distributed except
+# according to those terms.
+
+set -e
+
+CACHE_DIR="$1" # optional parameter pointing to a CI cache dir.
+LIBP2P_COMMIT="v0.2.1" # tags work too, only used in nim-libp2p CI for now
+[[ -n "$2" ]] && LIBP2P_COMMIT="$2" # allow overriding it on the command line
+SUBREPO_DIR="vendor/go/src/github.com/libp2p/go-libp2p-daemon"
+if [[ ! -e "$SUBREPO_DIR" ]]; then
+	# we're probably in nim-libp2p's CI
+	SUBREPO_DIR="go-libp2p-daemon"
+	rm -rf "$SUBREPO_DIR"
+	git clone -q https://github.com/status-im/go-libp2p-daemon
+	cd "$SUBREPO_DIR"
+	git checkout -q $LIBP2P_COMMIT
+	cd ..
+fi
+
+## env vars
+# verbosity level
+[[ -z "$V" ]] && V=0
+[[ -z "$BUILD_MSG" ]] && BUILD_MSG="Building p2pd ${LIBP2P_COMMIT}"
+
+# Windows detection
+if uname | grep -qiE "mingw|msys"; then
+	EXE_SUFFIX=".exe"
+	# otherwise it fails in AppVeyor due to https://github.com/git-for-windows/git/issues/2495
+	GIT_TIMESTAMP_ARG="--date=unix" # available since Git 2.9.4
+else
+	EXE_SUFFIX=""
+	GIT_TIMESTAMP_ARG="--date=format-local:%s" # available since Git 2.7.0
+fi
+
+TARGET_DIR="${GOPATH%:*}/bin" # if multiple paths are specified, use the first one
+TARGET_BINARY="${TARGET_DIR}/p2pd${EXE_SUFFIX}"
+
+target_needs_rebuilding() {
+	REBUILD=0
+	NO_REBUILD=1
+
+	if [[ -n "$CACHE_DIR" && -e "${CACHE_DIR}/p2pd${EXE_SUFFIX}" ]]; then
+		mkdir -p "${TARGET_DIR}"
+		cp -a "$CACHE_DIR"/* "${TARGET_DIR}/"
+	fi
+
+	# compare the built commit's timestamp to the date of the last commit (keep in mind that Git doesn't preserve file timestamps)
+	if [[ -e "${TARGET_DIR}/timestamp" && $(cat "${TARGET_DIR}/timestamp") -eq $(cd "$SUBREPO_DIR"; git log --pretty=format:%cd -n 1 ${GIT_TIMESTAMP_ARG}) ]]; then
+		return $NO_REBUILD
+	else
+		return $REBUILD
+	fi
+}
+
+build_target() {
+	echo -e "$BUILD_MSG"
+	[[ "$V" == "0" ]] && exec &>/dev/null
+
+	pushd "$SUBREPO_DIR"
+	# Go module downloads can fail randomly in CI VMs, so retry them a few times
+	MAX_RETRIES=5
+	CURR=0
+	while [[ $CURR -lt $MAX_RETRIES ]]; do
+		FAILED=0
+		go get ./... && break || FAILED=1
+		CURR=$(( CURR + 1 ))
+		echo "retry #${CURR}"
+	done
+	if [[ $FAILED == 1 ]]; then
+		echo "Error: still fails after retrying ${MAX_RETRIES} times."
+		exit 1
+	fi
+	go install ./...
+
+	# record the last commit's timestamp
+	git log --pretty=format:%cd -n 1 ${GIT_TIMESTAMP_ARG} > "${TARGET_DIR}/timestamp"
+
+	popd
+
+	# update the CI cache
+	if [[ -n "$CACHE_DIR" ]]; then
+		rm -rf "$CACHE_DIR"
+		mkdir "$CACHE_DIR"
+		cp -a "$TARGET_DIR"/* "$CACHE_DIR"/
+	fi
+}
+
+if target_needs_rebuilding; then
+	build_target
+else
+	echo "No rebuild needed."
+fi