diff --git a/.github/workflows/build-freebsd.yml b/.github/workflows/build-freebsd.yml
new file mode 100644
index 00000000..6dc46a39
--- /dev/null
+++ b/.github/workflows/build-freebsd.yml
@@ -0,0 +1,32 @@
+name: Build on FreeBSD
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    name: with UPnP
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v3
+
+    - name: Test in FreeBSD
+      id: test
+      uses: vmactions/freebsd-vm@v1
+      with:
+        usesh: true
+        mem: 2048
+        sync: rsync
+        copyback: true
+        prepare: pkg install -y devel/cmake devel/gmake devel/boost-libs security/openssl net/miniupnpc
+        run: |
+          cd build
+          cmake -DWITH_UPNP=ON -DCMAKE_BUILD_TYPE=Release .
+          gmake -j2
+
+    - name: Upload artifacts
+      uses: actions/upload-artifact@v3
+      with:
+        name: i2pd-freebsd
+        path: build/i2pd
diff --git a/ChangeLog b/ChangeLog
index 1e5156f9..31e8718b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,7 +9,7 @@
 ### Changed
 - Don't pick too active peer for first hop
 - Try peer test again if status is Unknown
-- Send peer tests with random delay 
+- Send peer tests with random delay
 - Reseeds list
 ### Fixed
 - XSS vulnerability in addresshelper