diff --git a/example/freetype/main.go b/example/freetype/main.go
index 83b8c3e5e4195dc324939ebc94619324492a0099..81f0d4dacc0cf26795fb8794d4256d1019b873ad 100644
--- a/example/freetype/main.go
+++ b/example/freetype/main.go
@@ -17,7 +17,7 @@ import (
 	"log"
 	"os"
 
-	"code.google.com/p/freetype-go/freetype"
+	"github.com/golang/freetype"
 )
 
 var (
diff --git a/example/gamma/main.go b/example/gamma/main.go
index 4bf7e3309be41856bc5488c9ba1365283c984573..a3d04933745d68745065703e762fb8bd3695a300 100644
--- a/example/gamma/main.go
+++ b/example/gamma/main.go
@@ -14,7 +14,7 @@ import (
 	"log"
 	"os"
 
-	"code.google.com/p/freetype-go/freetype/raster"
+	"github.com/golang/freetype/raster"
 )
 
 func p(x, y int) raster.Point {
diff --git a/example/raster/main.go b/example/raster/main.go
index 5e6c9815d1abd9e15054859ba31c4171c3b20618..45f23c18fa927fb7f7e90ce9e5412d3eb4ab4660 100644
--- a/example/raster/main.go
+++ b/example/raster/main.go
@@ -15,7 +15,7 @@ import (
 	"log"
 	"os"
 
-	"code.google.com/p/freetype-go/freetype/raster"
+	"github.com/golang/freetype/raster"
 )
 
 type node struct {
diff --git a/example/round/main.go b/example/round/main.go
index e2435f9a2774719c10b7fb5215a5bb948c204c6e..2333c454fc2484cbb665ec631a632e12b9746508 100644
--- a/example/round/main.go
+++ b/example/round/main.go
@@ -21,7 +21,7 @@ import (
 	"math"
 	"os"
 
-	"code.google.com/p/freetype-go/freetype/raster"
+	"github.com/golang/freetype/raster"
 )
 
 func main() {
diff --git a/example/truetype/main.go b/example/truetype/main.go
index 747694b61866a8b5c5d39092baeeaaa5a840cb17..04c26c13ecddd3a98e86b87e4f24da8961a3fe89 100644
--- a/example/truetype/main.go
+++ b/example/truetype/main.go
@@ -11,7 +11,7 @@ import (
 	"io/ioutil"
 	"log"
 
-	"code.google.com/p/freetype-go/freetype/truetype"
+	"github.com/golang/freetype/truetype"
 )
 
 var fontfile = flag.String("fontfile", "../../testdata/luxisr.ttf", "filename of the ttf font")
diff --git a/freetype/freetype.go b/freetype.go
similarity index 99%
rename from freetype/freetype.go
rename to freetype.go
index f53efd4ff086547bd47ac8475b8d04c58d32f870..97a1dbb7c03c08dad9a28eb519e7e03510aba73f 100644
--- a/freetype/freetype.go
+++ b/freetype.go
@@ -13,8 +13,8 @@ import (
 	"image"
 	"image/draw"
 
-	"code.google.com/p/freetype-go/freetype/raster"
-	"code.google.com/p/freetype-go/freetype/truetype"
+	"github.com/golang/freetype/raster"
+	"github.com/golang/freetype/truetype"
 )
 
 // These constants determine the size of the glyph cache. The cache is keyed
diff --git a/freetype/freetype_test.go b/freetype_test.go
similarity index 100%
rename from freetype/freetype_test.go
rename to freetype_test.go
diff --git a/freetype/raster/geom.go b/raster/geom.go
similarity index 100%
rename from freetype/raster/geom.go
rename to raster/geom.go
diff --git a/freetype/raster/paint.go b/raster/paint.go
similarity index 100%
rename from freetype/raster/paint.go
rename to raster/paint.go
diff --git a/freetype/raster/raster.go b/raster/raster.go
similarity index 100%
rename from freetype/raster/raster.go
rename to raster/raster.go
diff --git a/freetype/raster/stroke.go b/raster/stroke.go
similarity index 100%
rename from freetype/raster/stroke.go
rename to raster/stroke.go
diff --git a/freetype/truetype/glyph.go b/truetype/glyph.go
similarity index 100%
rename from freetype/truetype/glyph.go
rename to truetype/glyph.go
diff --git a/freetype/truetype/hint.go b/truetype/hint.go
similarity index 100%
rename from freetype/truetype/hint.go
rename to truetype/hint.go
diff --git a/freetype/truetype/hint_test.go b/truetype/hint_test.go
similarity index 100%
rename from freetype/truetype/hint_test.go
rename to truetype/hint_test.go
diff --git a/freetype/truetype/opcodes.go b/truetype/opcodes.go
similarity index 100%
rename from freetype/truetype/opcodes.go
rename to truetype/opcodes.go
diff --git a/freetype/truetype/truetype.go b/truetype/truetype.go
similarity index 100%
rename from freetype/truetype/truetype.go
rename to truetype/truetype.go
diff --git a/freetype/truetype/truetype_test.go b/truetype/truetype_test.go
similarity index 100%
rename from freetype/truetype/truetype_test.go
rename to truetype/truetype_test.go