diff --git a/registry/api/errcode/register.go b/registry/api/errcode/register.go
index 71cf6f7a..7489e84f 100644
--- a/registry/api/errcode/register.go
+++ b/registry/api/errcode/register.go
@@ -71,7 +71,10 @@ var (
 		Message: "too many requests",
 		Description: `Returned when a client attempts to contact a
 		service too many times`,
-		HTTPStatusCode: http.StatusTooManyRequests,
+		// FIXME: go1.5 doesn't export http.StatusTooManyRequests while
+		// go1.6 does. Update the hardcoded value to the constant once
+		// Docker updates golang version to 1.6.
+		HTTPStatusCode: 429,
 	})
 )
 
diff --git a/registry/client/errors.go b/registry/client/errors.go
index 804e69e0..adbaacf4 100644
--- a/registry/client/errors.go
+++ b/registry/client/errors.go
@@ -54,7 +54,10 @@ func parseHTTPErrorResponse(statusCode int, r io.Reader) error {
 		switch statusCode {
 		case http.StatusUnauthorized:
 			return errcode.ErrorCodeUnauthorized.WithMessage(detailsErr.Details)
-		case http.StatusTooManyRequests:
+		// FIXME: go1.5 doesn't export http.StatusTooManyRequests while
+		// go1.6 does. Update the hardcoded value to the constant once
+		// Docker updates golang version to 1.6.
+		case 429:
 			return errcode.ErrorCodeTooManyRequests.WithMessage(detailsErr.Details)
 		default:
 			return errcode.ErrorCodeUnknown.WithMessage(detailsErr.Details)