diff --git a/packages/addons/addon-depends/go/package.mk b/packages/addons/addon-depends/go/package.mk
index 627fc20550..fb99e7005c 100644
--- a/packages/addons/addon-depends/go/package.mk
+++ b/packages/addons/addon-depends/go/package.mk
@@ -44,7 +44,11 @@ PKG_AUTORECONF="no"
 configure_host() {
   export GOOS=linux
   export GOROOT_FINAL=$TOOLCHAIN/lib/golang
-  export GOROOT_BOOTSTRAP=/usr/lib/golang
+  if [ -x /usr/lib/go/bin/go ]; then
+    export GOROOT_BOOTSTRAP=/usr/lib/go
+  else
+    export GOROOT_BOOTSTRAP=/usr/lib/golang
+  fi
   export GOARCH=amd64
 }
 
diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile
new file mode 100644
index 0000000000..15b65b3993
--- /dev/null
+++ b/tools/docker/Dockerfile
@@ -0,0 +1,32 @@
+FROM ubuntu:xenial
+
+ARG DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get update \
+ && apt-get dist-upgrade -y \
+ && apt-get install -y locales sudo \
+ && rm -rf /var/lib/apt/lists/*
+
+RUN locale-gen en_US.UTF-8 \
+ && update-locale LANG=en_US.UTF-8 LANGUAGE=en_US:en
+ENV LANG=en_US.UTF-8 \
+    LANGUAGE=en_US:en \
+    LC_ALL=en_US.UTF-8
+
+RUN adduser --disabled-password --gecos '' docker \
+ && adduser docker sudo \
+ && echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
+
+RUN apt-get update && apt-get install -y \
+    wget bash bc gcc sed patch patchutils tar bzip2 gzip perl gawk gperf zip unzip diffutils texinfo lzop \
+    g++ xfonts-utils xfonts-utils xfonts-utils xsltproc default-jre-headless \
+    libc6-dev libncurses5-dev \
+    u-boot-tools \
+    xz-utils make file libxml-parser-perl \
+    libjson-perl \
+    golang-go \
+    git openssh-client \
+    --no-install-recommends \
+ && rm -rf /var/lib/apt/lists/*
+
+USER docker
diff --git a/tools/docker/README.md b/tools/docker/README.md
new file mode 100644
index 0000000000..bdfadeef21
--- /dev/null
+++ b/tools/docker/README.md
@@ -0,0 +1,17 @@
+# Build container
+
+**Clone repo**
+
+* `cd ~/`
+* `git clone https://github.com/LibreELEC/LibreELEC.tv.git LibreELEC`
+
+**Build container**
+
+* `cd ~/LibreELEC`
+* `docker build --pull -t libreelec tools/docker`
+
+**Build image inside container**
+
+* `docker run -v ~/:/home/docker -h libreelec -it libreelec`
+* `cd ~/LibreELEC`
+* `make image`