diff --git a/anda/tools/espanso-wayland/anda.hcl b/anda/tools/espanso-wayland/anda.hcl
new file mode 100644
index 0000000000..1ec502274e
--- /dev/null
+++ b/anda/tools/espanso-wayland/anda.hcl
@@ -0,0 +1,5 @@
+project pkg {
+	rpm {
+		spec = "espanso-wayland.spec"
+	}
+}
diff --git a/anda/tools/espanso-wayland/espanso-wayland.spec b/anda/tools/espanso-wayland/espanso-wayland.spec
new file mode 100644
index 0000000000..61b65d4fc8
--- /dev/null
+++ b/anda/tools/espanso-wayland/espanso-wayland.spec
@@ -0,0 +1,42 @@
+Name:			espanso-wayland
+Version: 		2.2.1
+Release:		1%?dist
+Summary:		Cross-platform Text Expander written in Rust for Wayland
+License:		GPL-3.0
+URL:			https://espanso.org
+Source0:		https://github.com/espanso/espanso/archive/refs/tags/v%version.tar.gz
+Requires:		libxkbcommon dbus libnotify wxGTK wl-clipboard
+Conflicts:		espanso-x11
+BuildRequires:	anda-srpm-macros cargo-rpm-macros gcc gcc-c++
+BuildRequires:	pkgconfig(x11)
+BuildRequires:	pkgconfig(xtst)
+BuildRequires:	pkgconfig(xkbcommon)
+BuildRequires:	pkgconfig(dbus-1)
+BuildRequires:	wxGTK-devel
+
+%description
+A cross-platform Text Expander written in Rust. A text expander is a program
+that detects when you type a specific keyword and replaces it with something
+else.
+
+This package includes the Wayland version of espanso.
+
+
+%prep
+%autosetup -n espanso-%version
+cd espanso
+%cargo_prep_online
+
+%build
+cd espanso
+#cargo_build -n -f vendored-tls -f wayland
+
+%install
+cd espanso
+%cargo_install -n -f vendored-tls -f wayland
+
+%files
+%_bindir/espanso
+
+%changelog
+%autochangelog
diff --git a/anda/tools/espanso-wayland/update.rhai b/anda/tools/espanso-wayland/update.rhai
new file mode 100644
index 0000000000..51e9bbde1b
--- /dev/null
+++ b/anda/tools/espanso-wayland/update.rhai
@@ -0,0 +1 @@
+rpm.version(gh("espanso/espanso"));
diff --git a/anda/tools/espanso-x11/anda.hcl b/anda/tools/espanso-x11/anda.hcl
new file mode 100644
index 0000000000..a0402813bd
--- /dev/null
+++ b/anda/tools/espanso-x11/anda.hcl
@@ -0,0 +1,5 @@
+project pkg {
+	rpm {
+		spec = "espanso-x11.spec"
+	}
+}
diff --git a/anda/tools/espanso-x11/espanso-x11.spec b/anda/tools/espanso-x11/espanso-x11.spec
new file mode 100644
index 0000000000..084c95822c
--- /dev/null
+++ b/anda/tools/espanso-x11/espanso-x11.spec
@@ -0,0 +1,42 @@
+Name:			espanso-x11
+Version: 		2.2.1
+Release:		1%?dist
+Summary:		Cross-platform Text Expander written in Rust for X11
+License:		GPL-3.0
+URL:			https://espanso.org
+Source0:		https://github.com/espanso/espanso/archive/refs/tags/v%version.tar.gz
+Requires:		libxkbcommon dbus libnotify wxGTK xdotool xclip libxcb
+Conflicts:		espanso-wayland
+BuildRequires:	anda-srpm-macros cargo-rpm-macros gcc gcc-c++
+BuildRequires:	pkgconfig(x11)
+BuildRequires:	pkgconfig(xtst)
+BuildRequires:	pkgconfig(xkbcommon)
+BuildRequires:	pkgconfig(dbus-1)
+BuildRequires:	wxGTK-devel
+
+%description
+A cross-platform Text Expander written in Rust. A text expander is a program
+that detects when you type a specific keyword and replaces it with something
+else.
+
+This package includes the X11 version of espanso.
+
+
+%prep
+%autosetup -n espanso-%version
+cd espanso
+%cargo_prep_online
+
+%build
+cd espanso
+#cargo_build -n -f vendored-tls
+
+%install
+cd espanso
+%cargo_install -n -f vendored-tls
+
+%files
+%_bindir/espanso
+
+%changelog
+%autochangelog
diff --git a/anda/tools/espanso-x11/update.rhai b/anda/tools/espanso-x11/update.rhai
new file mode 100644
index 0000000000..51e9bbde1b
--- /dev/null
+++ b/anda/tools/espanso-x11/update.rhai
@@ -0,0 +1 @@
+rpm.version(gh("espanso/espanso"));