diff --git a/internal/backend_s3.go b/internal/backend_s3.go
index 3ee2d489..aa42b0fd 100644
--- a/internal/backend_s3.go
+++ b/internal/backend_s3.go
@@ -124,6 +124,10 @@ func (s *S3Backend) newS3() {
 		s.setV2Signer(&s.S3.Handlers)
 	}
 	s.S3.Handlers.Sign.PushBack(addAcceptEncoding)
+	s.S3.Handlers.Build.PushFrontNamed(request.NamedHandler{
+		Name: "UserAgentHandler",
+		Fn:   request.MakeAddToUserAgentHandler("goofys", VersionNumber+"-"+VersionHash),
+	})
 }
 
 func (s *S3Backend) detectBucketLocationByHEAD() (err error, isAws bool) {
diff --git a/internal/flags.go b/internal/flags.go
index f18633a8..0cea21f4 100644
--- a/internal/flags.go
+++ b/internal/flags.go
@@ -77,6 +77,7 @@ COPYRIGHT:
 `
 }
 
+var VersionNumber string
 var VersionHash string
 
 func NewApp() (app *cli.App) {
@@ -86,7 +87,7 @@ func NewApp() (app *cli.App) {
 
 	app = &cli.App{
 		Name:     "goofys",
-		Version:  "0.24.0-" + VersionHash,
+		Version:  VersionNumber + "-" + VersionHash,
 		Usage:    "Mount an S3 bucket locally",
 		HideHelp: true,
 		Writer:   os.Stderr,
diff --git a/main.go b/main.go
index e2e06a1f..112b8595 100644
--- a/main.go
+++ b/main.go
@@ -134,6 +134,7 @@ func massageArg0() {
 var Version = "use `make build' to fill version hash correctly"
 
 func main() {
+	VersionNumber = "0.24.0"
 	VersionHash = Version
 
 	massagePath()