diff --git a/cli/package.json b/cli/package.json
index 6b5c0617..354ce9c9 100644
--- a/cli/package.json
+++ b/cli/package.json
@@ -4,6 +4,11 @@
   "description": "A CLI for Squoosh",
   "public": true,
   "type": "module",
+  "homepage": "https://github.com/GoogleChromeLabs/squoosh",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/GoogleChromeLabs/squoosh.git"
+  },
   "bin": {
     "squoosh-cli": "src/index.js",
     "@squoosh/cli": "src/index.js"
diff --git a/cli/src/index.js b/cli/src/index.js
index 697e4f52..331d31b7 100755
--- a/cli/src/index.js
+++ b/cli/src/index.js
@@ -177,8 +177,8 @@ async function processFiles(files) {
       jobsFinished++;
       const outputPath = path.join(
         program.opts().outputDir,
-        program.opts().suffix +
-          path.basename(originalFile, path.extname(originalFile)),
+        path.basename(originalFile, path.extname(originalFile)) +
+        program.opts().suffix
       );
       for (const output of Object.values(image.encodedWith)) {
         const outputFile = `${outputPath}.${(await output).extension}`;
diff --git a/libsquoosh/package.json b/libsquoosh/package.json
index c8baa876..36289ccd 100644
--- a/libsquoosh/package.json
+++ b/libsquoosh/package.json
@@ -12,6 +12,11 @@
   },
   "keywords": [],
   "author": "Google Chrome Developers <chromium-dev@google.com>",
+  "homepage": "https://github.com/GoogleChromeLabs/squoosh",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/GoogleChromeLabs/squoosh.git"
+  },
   "license": "Apache-2.0",
   "engines": {
     "node": " ^12.5.0 || ^14.0.0 || ^16.0.0 "