diff --git a/gcc-5.3.0-0.bee b/gcc.be0
similarity index 93%
rename from gcc-5.3.0-0.bee
rename to gcc.be0
index 50970cf83..307d17ccc 100755
--- a/gcc-5.3.0-0.bee
+++ b/gcc.be0
@@ -1,5 +1,7 @@
 #!/bin/env beesh
 
+# BEE_VERSION gcc-5.3.0-1
+
 SRCURL[0]="http://ftp.gnu.org/gnu/gcc/gcc-${PKGVERSION}/gcc-${PKGVERSION}.tar.bz2"
 
 LIBEXECDIR=/usr/lib
@@ -9,7 +11,7 @@ mee_patch_post() {
 
     # ignore libiberty.. used from binutils..
     sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in
-    
+
     # don't fix includes..
     sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
 }
@@ -21,7 +23,7 @@ mee_configure() {
        --enable-threads=posix \
        --enable-__cxa_atexit \
        --enable-clocale=gnu \
-       --enable-languages=c,fortran,c++,go,objc,obj-c++ \
+       --enable-languages=c,fortran,c++,objc,obj-c++ \
        --disable-multilib \
        --with-system-zlib
 }
@@ -43,10 +45,10 @@ mee_install_post() {
 
     mv -v ${D}${LIBDIR}64/* ${D}${LIBDIR}
     rmdir -v  ${D}${LIBDIR}64
-    
+
     mkdir -p ${D}${DATADIR}/gdb/auto-load/${LIBDIR}
     mv -v ${D}${LIBDIR}/*-gdb.py ${D}${DATADIR}/gdb/auto-load/${LIBDIR}
-    
+
     echo "${S}/contrib/test_summary | grep -A7 Sum"
     echo "grep FAIL ${B}/check.log"
 }
diff --git a/go.be0 b/go.be0
new file mode 100755
index 000000000..163eb58e1
--- /dev/null
+++ b/go.be0
@@ -0,0 +1,64 @@
+#!/usr/bin/env beesh
+
+# BEE_VERSION go-1.9.2-0
+
+SRCURL[0]="https://redirector.gvt1.com/edgedl/go/go${PKGVERSION}.src.tar.gz"
+
+# PATCHURL+=()
+
+# EXCLUDE+=()
+
+build_in_sourcedir
+
+sourcesubdir_append src
+
+
+#mee_extract() {
+#    bee_extract "${@}"
+#}
+
+#mee_patch() {
+#    bee_patch "${@}"
+#}
+
+#mee_configure() {
+#    bee_configure
+#}
+
+mee_build() {
+    export GOROOT_BOOTSTRAP=${PREFIX} \
+    GOROOT_FINAL=${LIBDIR}/go-${PKGVERSION}
+    start_cmd ${S}/make.bash #${BEE_MAKEFLAGS}
+    exit
+}
+
+mee_install() {
+    # Install Binaries
+    start_cmd mkdir -p ${D}${BINDIR}
+    start_cmd mkdir -p ${D}${LIBDIR}/go-${PKGVERSION}
+    start_cmd cp -r ${S}/../bin ${D}${LIBDIR}/go-${PKGVERSION}
+    cd ${D}${BINDIR}
+    start_cmd ln -s ../lib/go-${PKGVERSION}/bin/go go
+    start_cmd ln -s ../lib/go-${PKGVERSION}/bin/gofmt gofmt
+
+    # Install standardlibs https://golang.org/pkg/#stdlib
+    LIBS="archive bufio builtin bytes compress container context crypto database \
+    debug encoding errors expvar flag fmt go hash html image index internal io \
+    log math mime net os path plugin reflect regexp runtime sort strconv strings \
+    sync syscall testing text time unicode unsafe"
+
+    start_cmd ${S}/../bin/go install -buildmode=shared std
+
+    start_cmd mkdir -p ${D}${LIBDIR}/go-${PKGVERSION}/src
+    for i in $LIBS; do
+        start_cmd cp -r ${S}/${i} ${D}${LIBDIR}/go-${PKGVERSION}/src
+    done
+
+    #Install tools for go
+    start_cmd mkdir -p ${D}${LIBDIR}/go-${PKGVERSION}/pkg
+    start_cmd cp -r ${S}/../pkg/tool ${D}${LIBDIR}/go-${PKGVERSION}/pkg
+    start_cmd cp -r ${S}/../pkg/include ${D}${LIBDIR}/go-${PKGVERSION}/pkg
+    start_cmd cp -r ${S}/../pkg/linux_amd64 ${D}${LIBDIR}/go-${PKGVERSION}/pkg
+    start_cmd cp -r ${S}/../pkg/linux_amd64_dynlink ${D}${LIBDIR}/go-${PKGVERSION}/pkg
+}
+## by default this may be 'make install DESTDIR="${D}"'