diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 16c067a..cfb1161 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -24,8 +24,8 @@ jobs:
           sudo apt-get install libdbus-1-dev -y
           sudo apt-get install libssl-dev -y
           sudo apt-get install pkg-config -y
-      - name: install cargo-deb
-        run: cargo install cargo-deb
+      - run: cargo install cargo-deb
+      - run: cargo install cargo-generate-rpm
 
       # Build aw-webui
       - name: Checkout aw-webui
@@ -81,10 +81,11 @@ jobs:
           file_glob: true
           file: target/debian/awatcher*.deb
 
-      - run: cargo deb --variant=module
-      - name: Upload module deb to release
+      - run: cargo generate-rpm --variant=bundle
+      - run: cargo generate-rpm --variant=module
+      - name: Upload bundle RPM to release
         uses: svenstaro/upload-release-action@v2
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file_glob: true
-          file: target/debian/aw-awatcher*.deb
+          file: target/generate-rpm/*.rpm
diff --git a/Cargo.toml b/Cargo.toml
index dc81318..c359f56 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -4,6 +4,7 @@ description = "An activity and idle watcher based on ActivityWatch"
 version = { workspace = true }
 authors = ["Demmie <2e3s19@gmail.com>"]
 edition = "2021"
+license = "Mozilla Public License 2.0"
 license-file = "LICENSE"
 repository = "https://github.com/2e3s/awatcher"
 
@@ -79,3 +80,22 @@ assets = [
     ["README.md", "usr/share/doc/awatcher/README", "644"],
 ]
 conflicts = "aw-awatcher"
+
+[package.metadata.generate-rpm.variants.module]
+name = "aw-awatcher"
+assets = [
+    { source = "target/release/awatcher", dest = "/usr/bin/aw-awatcher", mode = "755" },
+]
+
+[package.metadata.generate-rpm.variants.module.conflicts]
+awatcher = "*"
+
+[package.metadata.generate-rpm.variants.bundle]
+assets = [
+    { source = "target/release/awatcher", dest = "/usr/bin/awatcher", mode = "755" },
+    { source = "src/bundle/awatcher.desktop", dest = "/usr/share/applications/", mode = "644" },
+    { source = "src/bundle/logo.png", dest = "/usr/share/awatcher/icons/awatcher.png", mode = "644" },
+]
+
+[package.metadata.generate-rpm.variants.bundle.conflicts]
+aw-awatcher = "*"