diff --git a/states/fd/install.sls b/states/fd/install.sls
index 60fe37d..9348c5c 100644
--- a/states/fd/install.sls
+++ b/states/fd/install.sls
@@ -1,17 +1,26 @@
 ---
 {%- from "fd/map.jinja" import fd with context %}
+{% set archive_exclude_dir = './fd-v' + fd.version + '-' + fd.arch + '-unknown-' + fd.os + '-musl' %}
 fd-archive-extract:
   archive.extracted:
     - name: {{ fd.release_dir }}/fd-{{ fd.version }}
-    - source: {{ fd.mirror }}/v{{ fd.version }}/fd_v{{ fd.version }}-{{ fd.arch }}-unknown-{{ fd.os|lower }}-musl.tar.gz
+    - source: {{ fd.mirror }}/v{{ fd.version }}/fd-v{{ fd.version }}-{{ fd.arch }}-unknown-{{ fd.os|lower }}-musl.tar.gz
     - skip_verify: true
+    - options: >
+        --transform 's|^\{{ archive_exclude_dir }}|/|g'
+        --transform 's|LICENSE.*||g'
+        --transform 's|fd\.1||g'
+        --transform 's|CHANGELOG.*||g'
+        --transform 's|autocomplete||g'
+        --transform 's|README.md||g'
+        --strip 1
     - enforce_toplevel: false
-    - if_missing: {{ fd.release_dir }}/fd-v{{ fd.version }}/fd
+    - if_missing: {{ fd.release_dir }}/fd-{{ fd.version }}/fd
 
 fd-binary-symlink:
   file.symlink:
     - name: /usr/local/bin/fd
-    - target: {{ fd.release_dir }}/fd-v{{ fd.version }}-{{ fd.os }}-{{ fd.arch }}/fd
+    - target: {{ fd.release_dir }}/fd-{{ fd.version }}/fd
     - force: true
     - require:
       - archive: fd-archive-extract
@@ -20,4 +29,4 @@ fd-cleanup:
   software.cleanup:
     - name: fd
     - path: {{ fd.release_dir }}
-    - version: "v{{ fd.version }}"
+    - version: "{{ fd.version }}"
diff --git a/states/fd/osarchmap.yaml b/states/fd/osarchmap.yaml
index 08be675..9fde1c4 100644
--- a/states/fd/osarchmap.yaml
+++ b/states/fd/osarchmap.yaml
@@ -1,9 +1,9 @@
 ---
 amd64:
-  arch: "amd64"
+  arch: "x86_64"
 
 x86_64:
-  arch: "amd64"
+  arch: "x86_64"
 
 386:
   arch: "386"