diff --git a/plugin/loader/preload.sh b/plugin/loader/preload.sh
index dab8cfee4..93ee3e43b 100755
--- a/plugin/loader/preload.sh
+++ b/plugin/loader/preload.sh
@@ -14,7 +14,7 @@ import (
 EOL
 
 to_preload | while read -r name path num; do
-	echo "\tplugin$name \"$path\""
+	echo "plugin$name \"$path\""
 done | sort -u
 
 cat <<EOL
@@ -24,7 +24,7 @@ var preloadPlugins = []plugin.Plugin{
 EOL
 
 to_preload | while read -r name path num; do
-	echo "\tplugin$name.Plugins[$num],"
+	echo "plugin$name.Plugins[$num],"
 done
 
 
diff --git a/plugin/loader/preload_list b/plugin/loader/preload_list
index 8c62c673b..2905dfe1c 100644
--- a/plugin/loader/preload_list
+++ b/plugin/loader/preload_list
@@ -3,4 +3,4 @@
 #
 # name             go-path                  number of the sub-plugin
 
-#ipldgit github.com/ipfs/go-ipfs/plugin/plugins/git 0
+ipldgit github.com/ipfs/go-ipfs/plugin/plugins/git 0
diff --git a/plugin/plugins/.gitignore b/plugin/plugins/.gitignore
index 140f8cf80..641a6c03e 100644
--- a/plugin/plugins/.gitignore
+++ b/plugin/plugins/.gitignore
@@ -1 +1,2 @@
 *.so
+*/main
diff --git a/plugin/plugins/Rules.mk b/plugin/plugins/Rules.mk
index 570f0ba33..e571263dd 100644
--- a/plugin/plugins/Rules.mk
+++ b/plugin/plugins/Rules.mk
@@ -2,9 +2,16 @@ include mk/header.mk
 
 $(d)_plugins:=$(d)/git
 $(d)_plugins_so:=$(addsuffix .so,$($(d)_plugins))
+$(d)_plugins_main:=$(addsuffix /main/main.go,$($(d)_plugins))
 
+
+$($(d)_plugins_main): d:=$(d)
+$($(d)_plugins_main):
+	$(d)/gen_main.sh "$(dir $@).." "$(call go-pkg-name,$(dir $@)/..)"
+
+$($(d)_plugins_so): %.so : %/main/main.go
 $($(d)_plugins_so): $$(DEPS_GO) ALWAYS
-	go build -buildmode=plugin -i -pkgdir "$$GOPATH/pkg/linux_amd64_dynlink" $(go-flags-with-tags) -o "$@" "$(call go-pkg-name,$(basename $@))"
+	go build -buildmode=plugin -i -pkgdir "$(GOPATH)/pkg/linux_amd64_dynlink" $(go-flags-with-tags) -o "$@" "$(call go-pkg-name,$(basename $@))/main"
 	chmod +x "$@"
 
 CLEAN += $($(d)_plugins_so)
diff --git a/plugin/plugins/gen_main.sh b/plugin/plugins/gen_main.sh
new file mode 100755
index 000000000..6ea705cfe
--- /dev/null
+++ b/plugin/plugins/gen_main.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+dir=${1:?first paramater with dir to work in is required}
+pkg=${2:?second parameter with full name of the package is required}
+main_pkg="$dir/main"
+
+shortpkg="uniquepkgname"
+
+mkdir -p "$main_pkg"
+
+cat > "$main_pkg/main.go" <<EOL
+package main
+import (
+	$shortpkg "$pkg"
+)
+
+var Plugins = $shortpkg.Plugins
+EOL
diff --git a/plugin/plugins/git/git.go b/plugin/plugins/git/git.go
index f7cab2a6a..5a0763301 100644
--- a/plugin/plugins/git/git.go
+++ b/plugin/plugins/git/git.go
@@ -1,4 +1,4 @@
-package main
+package git
 
 import (
 	"compress/zlib"