diff --git a/projects/filippo.io/yubikey-agent/package.yml b/projects/filippo.io/yubikey-agent/package.yml
new file mode 100644
index 00000000..1fa4f82d
--- /dev/null
+++ b/projects/filippo.io/yubikey-agent/package.yml
@@ -0,0 +1,47 @@
+distributable:
+  url: https://github.com/FiloSottile/yubikey-agent/archive/refs/tags/v{{version}}.tar.gz
+  strip-components: 1
+
+display-name: yubikey-agent
+
+versions:
+  github: FiloSottile/yubikey-agent/tags
+
+dependencies:
+  pcsclite.apdu.fr: ^2
+  linux:
+    gnupg.org/pinentry: '*'
+
+build:
+  dependencies:
+    go.dev: '^1.20'
+  script:
+    - go mod download
+    - go build -ldflags "$LDFLAGS" -o "{{prefix}}"/bin/yubikey-agent
+
+  env:
+    LDFLAGS:
+      - -s
+      - -w
+      - -X=filippo.io/yubikey-agent/main.Version=v{{ version }}
+    linux:
+      LDFLAGS:
+        - -buildmode=pie
+
+provides:
+  - bin/yubikey-agent
+
+test:
+  dependencies:
+    linux:
+      gitlab.com/procps-ng/procps: '*'
+  script:
+    - yubikey-agent -l ./yubikey-agent.sock &
+    - sleep 1
+    - test -S ./yubikey-agent.sock
+    - $KILL yubikey-agent
+  env:
+    darwin:
+      KILL: killall
+    linux:
+      KILL: pkill
diff --git a/projects/pcsclite.apdu.fr/package.yml b/projects/pcsclite.apdu.fr/package.yml
index eeb04233..23a773c4 100644
--- a/projects/pcsclite.apdu.fr/package.yml
+++ b/projects/pcsclite.apdu.fr/package.yml
@@ -22,9 +22,14 @@ build:
     cmake.org: ^3
     github.com/westes/flex: '*'
     perl.org: ^5 # pod2man
-  script: |
-    ./configure $ARGS
-    make install
+  script:
+    - ./configure $ARGS
+    - make install
+    - run: |
+        mv PCSC/* .
+        rmdir PCSC
+        ln -s . PCSC
+      working-directory: ${{ prefix }}/include
   env:
     ARGS:
       - --disable-dependency-tracking