diff --git a/registry/api/errcode/errors.go b/registry/api/errcode/errors.go
index 4c35b879a..54856cc5c 100644
--- a/registry/api/errcode/errors.go
+++ b/registry/api/errcode/errors.go
@@ -147,7 +147,7 @@ type ErrorDescriptor struct {
 	// keyed value when serializing api errors.
 	Value string
 
-	// Message is a short, human readable decription of the error condition
+	// Message is a short, human readable description of the error condition
 	// included in API responses.
 	Message string
 
diff --git a/registry/api/v2/urls.go b/registry/api/v2/urls.go
index 3c3ec9893..876a190cb 100644
--- a/registry/api/v2/urls.go
+++ b/registry/api/v2/urls.go
@@ -32,7 +32,7 @@ func NewURLBuilder(root *url.URL, relative bool) *URLBuilder {
 	}
 }
 
-// NewURLBuilderFromString workes identically to NewURLBuilder except it takes
+// NewURLBuilderFromString works identically to NewURLBuilder except it takes
 // a string argument for the root, returning an error if it is not a valid
 // url.
 func NewURLBuilderFromString(root string, relative bool) (*URLBuilder, error) {
@@ -58,7 +58,7 @@ func NewURLBuilderFromRequest(r *http.Request, relative bool) *URLBuilder {
 		scheme = r.URL.Scheme
 	}
 
-	// Handle fowarded headers
+	// Handle forwarded headers
 	// Prefer "Forwarded" header as defined by rfc7239 if given
 	// see https://tools.ietf.org/html/rfc7239
 	if forwarded := r.Header.Get("Forwarded"); len(forwarded) > 0 {
diff --git a/registry/client/auth/challenge/authchallenge.go b/registry/client/auth/challenge/authchallenge.go
index fe238210c..3dae9538e 100644
--- a/registry/client/auth/challenge/authchallenge.go
+++ b/registry/client/auth/challenge/authchallenge.go
@@ -38,7 +38,7 @@ type Manager interface {
 }
 
 // NewSimpleManager returns an instance of
-// Manger which only maps endpoints to challenges
+// Manager which only maps endpoints to challenges
 // based on the responses which have been added the
 // manager. The simple manager will make no attempt to
 // perform requests on the endpoints or cache the responses