diff --git a/.gitignore b/.gitignore
index a600027..554bc93 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/external-dns
+external-dns
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 4fdb9d0..3c3d106 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -15,6 +15,10 @@
 			"ImportPath": "github.com/mitchellh/goamz/route53",
 			"Rev": "caaaea8b30ee15616494ee68abd5d8ebbbef05cf"
 		},
+		{
+			"ImportPath": "github.com/rancher/go-rancher-metadata/metadata",
+			"Rev": "08bc028a34ea0c033e4ca7eb0a209ce0afe6aa3b"
+		},
 		{
 			"ImportPath": "github.com/vaughan0/go-ini",
 			"Rev": "a98ad7ee00ec53921f08832bc06ecf7fd600e6a1"
diff --git a/metadata/handler.go b/Godeps/_workspace/src/github.com/rancher/go-rancher-metadata/metadata/handler.go
similarity index 100%
rename from metadata/handler.go
rename to Godeps/_workspace/src/github.com/rancher/go-rancher-metadata/metadata/handler.go
diff --git a/metadata/types.go b/Godeps/_workspace/src/github.com/rancher/go-rancher-metadata/metadata/types.go
similarity index 100%
rename from metadata/types.go
rename to Godeps/_workspace/src/github.com/rancher/go-rancher-metadata/metadata/types.go
diff --git a/external-dns.go b/external-dns.go
index ac8a153..1ed1fd1 100644
--- a/external-dns.go
+++ b/external-dns.go
@@ -3,13 +3,13 @@ package main
 import (
 	"fmt"
 	"github.com/Sirupsen/logrus"
-	"github.com/rancher/external-dns/metadata"
 	"github.com/rancher/external-dns/providers"
+	"github.com/rancher/go-rancher-metadata/metadata"
 	"strings"
 	"sync"
 )
 
-func UpdateDnsRecords(m metadata.MetadataHandler) error {
+func UpdateDnsRecords(m metadata.Handler) error {
 	metadataRecs, err := getMetadataDnsRecords(m)
 	if err != nil {
 		return fmt.Errorf("Error reading external dns entries: %v", err)
@@ -168,7 +168,7 @@ func getProviderDnsRecords() (map[string]providers.DnsRecord, error) {
 	return ourRecords, nil
 }
 
-func getMetadataDnsRecords(m metadata.MetadataHandler) (map[string]providers.DnsRecord, error) {
+func getMetadataDnsRecords(m metadata.Handler) (map[string]providers.DnsRecord, error) {
 
 	containers, err := m.GetContainers()
 	if err != nil {
diff --git a/main.go b/main.go
index e852e90..ca9767c 100644
--- a/main.go
+++ b/main.go
@@ -3,8 +3,8 @@ package main
 import (
 	"flag"
 	"github.com/Sirupsen/logrus"
-	"github.com/rancher/external-dns/metadata"
 	"github.com/rancher/external-dns/providers"
+	"github.com/rancher/go-rancher-metadata/metadata"
 	"os"
 	"time"
 )
@@ -31,7 +31,7 @@ var (
 	logFile         = flag.String("log", "", "Log file")
 	EnvironmentName string
 	provider        providers.Provider
-	m               metadata.MetadataHandler
+	m               metadata.Handler
 )
 
 func setEnv() {
diff --git a/providers/route53.go b/providers/route53.go
index ed8b60b..e2647be 100644
--- a/providers/route53.go
+++ b/providers/route53.go
@@ -19,7 +19,7 @@ var (
 	region     aws.Region
 )
 
-func main() {
+func init() {
 	route53Handler := &Route53Handler{}
 	if err := RegisterProvider("route53", route53Handler); err != nil {
 		logrus.Fatal("Could not register route53 provider")