diff --git a/design/random.go b/design/random.go
index c2221b88b4..b161bc39f4 100644
--- a/design/random.go
+++ b/design/random.go
@@ -7,8 +7,8 @@ import (
 	"math/rand"
 	"time"
 
+	uuid "github.com/gofrs/uuid"
 	"github.com/manveru/faker"
-	uuid "github.com/satori/go.uuid"
 )
 
 // RandomGenerator generates consistent random values of different types given a seed.
diff --git a/design/types.go b/design/types.go
index 40d3deac53..8e1921c52d 100644
--- a/design/types.go
+++ b/design/types.go
@@ -18,7 +18,7 @@ import (
 	"time"
 
 	"github.com/goadesign/goa/dslengine"
-	uuid "github.com/satori/go.uuid"
+	uuid "github.com/gofrs/uuid"
 )
 
 // DefaultView is the name of the default view.
diff --git a/goagen/gen_app/generator.go b/goagen/gen_app/generator.go
index 3396809f73..5b2b055390 100644
--- a/goagen/gen_app/generator.go
+++ b/goagen/gen_app/generator.go
@@ -151,7 +151,7 @@ func (g *Generator) generateContexts() (err error) {
 		codegen.SimpleImport("time"),
 		codegen.SimpleImport("unicode/utf8"),
 		codegen.SimpleImport("github.com/goadesign/goa"),
-		codegen.NewImport("uuid", "github.com/satori/go.uuid"),
+		codegen.NewImport("uuid", "github.com/gofrs/uuid"),
 		codegen.SimpleImport("context"),
 	}
 	g.API.IterateResources(func(r *design.ResourceDefinition) error {
@@ -244,7 +244,7 @@ func (g *Generator) generateControllers() (err error) {
 		codegen.SimpleImport("regexp"),
 		codegen.SimpleImport("strconv"),
 		codegen.SimpleImport("time"),
-		codegen.NewImport("uuid", "github.com/satori/go.uuid"),
+		codegen.NewImport("uuid", "github.com/gofrs/uuid"),
 	}
 	encoders, err := BuildEncoders(g.API.Produces, true)
 	if err != nil {
@@ -448,7 +448,7 @@ func (g *Generator) generateMediaTypes() (err error) {
 		codegen.SimpleImport("fmt"),
 		codegen.SimpleImport("time"),
 		codegen.SimpleImport("unicode/utf8"),
-		codegen.NewImport("uuid", "github.com/satori/go.uuid"),
+		codegen.NewImport("uuid", "github.com/gofrs/uuid"),
 	}
 	for _, v := range g.API.MediaTypes {
 		imports = codegen.AttributeImports(v.AttributeDefinition, imports, nil)
@@ -496,7 +496,7 @@ func (g *Generator) generateUserTypes() (err error) {
 		codegen.SimpleImport("time"),
 		codegen.SimpleImport("unicode/utf8"),
 		codegen.SimpleImport("github.com/goadesign/goa"),
-		codegen.NewImport("uuid", "github.com/satori/go.uuid"),
+		codegen.NewImport("uuid", "github.com/gofrs/uuid"),
 	}
 	for _, v := range g.API.Types {
 		imports = codegen.AttributeImports(v.AttributeDefinition, imports, nil)
diff --git a/goagen/gen_app/test_generator.go b/goagen/gen_app/test_generator.go
index 75ab8866df..1aab7192d9 100644
--- a/goagen/gen_app/test_generator.go
+++ b/goagen/gen_app/test_generator.go
@@ -96,7 +96,7 @@ func (g *Generator) generateResourceTest() error {
 		codegen.SimpleImport("github.com/goadesign/goa"),
 		codegen.SimpleImport("github.com/goadesign/goa/goatest"),
 		codegen.SimpleImport("context"),
-		codegen.NewImport("uuid", "github.com/satori/go.uuid"),
+		codegen.NewImport("uuid", "github.com/gofrs/uuid"),
 	}
 
 	return g.API.IterateResources(func(res *design.ResourceDefinition) (err error) {
diff --git a/uuid/uuid.go b/uuid/uuid.go
index b1b113b0ed..a48f4d6cd5 100644
--- a/uuid/uuid.go
+++ b/uuid/uuid.go
@@ -9,7 +9,7 @@ import (
 	"database/sql/driver"
 	"fmt"
 
-	uuid "github.com/satori/go.uuid"
+	uuid "github.com/gofrs/uuid"
 )
 
 // FromString Wrapper around the real FromString
diff --git a/uuid/uuid_js.go b/uuid/uuid_js.go
index 12d0cc78c2..329f0476ca 100644
--- a/uuid/uuid_js.go
+++ b/uuid/uuid_js.go
@@ -1,6 +1,6 @@
 // +build js
 
-//This part is copied from github.com/satori/go.uuid but some feature uses non gopherjs compliants calls
+//This part is copied from github.com/gofrs/uuid but some feature uses non gopherjs compliants calls
 //Since goa only needs a subset of the features the js copies them in here
 
 package uuid