diff --git a/drive/fs.go b/drive/fs.go
index 36348e584..20bdd0555 100644
--- a/drive/fs.go
+++ b/drive/fs.go
@@ -22,12 +22,12 @@ package drive
 // * files with / in name
 
 import (
-	"../fs"
 	"code.google.com/p/goauth2/oauth"
 	"code.google.com/p/google-api-go-client/drive/v2"
 	"errors"
 	"flag"
 	"fmt"
+	"github.com/ncw/rclone/fs"
 	"io"
 	"log"
 	"mime"
diff --git a/local/fs.go b/local/fs.go
index c7a8a89a9..48788e1d8 100644
--- a/local/fs.go
+++ b/local/fs.go
@@ -2,9 +2,9 @@
 package local
 
 import (
-	"../fs"
 	"crypto/md5"
 	"fmt"
+	"github.com/ncw/rclone/fs"
 	"io"
 	"io/ioutil"
 	"log"
diff --git a/rclone.go b/rclone.go
index e66c2c010..361468bdf 100644
--- a/rclone.go
+++ b/rclone.go
@@ -4,9 +4,9 @@
 package main
 
 import (
-	"./fs"
 	"flag"
 	"fmt"
+	"github.com/ncw/rclone/fs"
 	"log"
 	"os"
 	"runtime"
@@ -15,10 +15,10 @@ import (
 	"sync"
 	"time"
 	// Active file systems
-	_ "./drive"
-	_ "./local"
-	_ "./s3"
-	_ "./swift"
+	_ "github.com/ncw/rclone/drive"
+	_ "github.com/ncw/rclone/local"
+	_ "github.com/ncw/rclone/s3"
+	_ "github.com/ncw/rclone/swift"
 )
 
 // Globals
diff --git a/s3/fs.go b/s3/fs.go
index 4d732350c..8c83596da 100644
--- a/s3/fs.go
+++ b/s3/fs.go
@@ -4,14 +4,14 @@ package s3
 // FIXME need to prevent anything but ListDir working for s3://
 
 import (
-	"../fs"
 	"errors"
 	"flag"
 	"fmt"
+	"github.com/ncw/goamz/aws"
+	"github.com/ncw/goamz/s3"
+	"github.com/ncw/rclone/fs"
 	"github.com/ncw/swift"
 	"io"
-	"launchpad.net/goamz/aws"
-	"launchpad.net/goamz/s3"
 	"log"
 	"mime"
 	"net/http"
diff --git a/swift/fs.go b/swift/fs.go
index 754883115..d1cb70fb2 100644
--- a/swift/fs.go
+++ b/swift/fs.go
@@ -4,10 +4,10 @@ package swift
 // FIXME need to prevent anything but ListDir working for swift://
 
 import (
-	"../fs"
 	"errors"
 	"flag"
 	"fmt"
+	"github.com/ncw/rclone/fs"
 	"github.com/ncw/swift"
 	"io"
 	"log"