diff --git a/3rdParty/Makefile.etcd b/3rdParty/Makefile.etcd
index 460dbc8bd2..9c16d8014c 100644
--- a/3rdParty/Makefile.etcd
+++ b/3rdParty/Makefile.etcd
@@ -15,7 +15,11 @@
 	@echo "--------------------------------------------------------------------------------"
 	@echo
 
+if ENABLE_INTERNAL_GO
+	cd @top_srcdir@/3rdParty/etcd && GOROOT="`pwd`/../go-$(TRI_BITS)/" PATH="`pwd`/../go-$(TRI_BITS)/bin:$$PATH" ./build
+else
 	cd @top_srcdir@/3rdParty/etcd && ./build
+endif
 	cp @top_srcdir@/3rdParty/etcd/bin/etcd @top_srcdir@/bin/etcd-arango
 
 	@echo
diff --git a/configure.ac b/configure.ac
index 91f141ebc5..64a242d1d8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -129,6 +129,18 @@ AC_ARG_ENABLE(all-in-one-etcd,
 
 AM_CONDITIONAL(ENABLE_ALL_IN_ONE_ETCD, test "x$tr_ALL_IN_ONE_ETCD" = xyes)
 
+dnl ----------------------------------------------------------------------------
+dnl GO
+dnl ----------------------------------------------------------------------------
+
+AC_ARG_ENABLE(internal-go,
+  AS_HELP_STRING([--enable-internal-go], [use  go binaries from 3rdParty directory (default: no)]),
+  [tr_INTERNAL_GO="${enableval:-yes}"],
+  [tr_INTERNAL_GO=no]
+)
+
+AM_CONDITIONAL(ENABLE_INTERNAL_GO, test "x$tr_INTERNAL_GO" = xyes)
+
 dnl ============================================================================
 dnl --SECTION--                                                          OPTIONS
 dnl ============================================================================