diff --git a/.github/workflows/rebase-onto-upstream.yml b/.github/workflows/rebase-onto-upstream.yml
new file mode 100644
index 00000000000..90b3b53aa0f
--- /dev/null
+++ b/.github/workflows/rebase-onto-upstream.yml
@@ -0,0 +1,44 @@
+name: Rebase onto upstream
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '0 8 1,15 * *'
+
+jobs:
+  push:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        base_ref:
+          - akirak
+          # - admin
+        upstream_branch:
+          - 'master'
+
+    steps:
+
+    - uses: actions/checkout@v3
+      with:
+        fetch-depth: 0
+        ref: ${{ matrix.base_ref }}
+
+    - name: Fetch the upstream
+      run: |
+        git remote add upstream https://github.com/melpa/melpa.git
+        git fetch upstream ${{ matrix.upstream_branch }}
+
+    - name: Cherry pick commits
+      run: |
+        git config --add user.name 'github-actions[bot]'
+        git config --add user.email '6270544+github-actions[bot]@users.noreply.github.com'
+        git rebase -s ort -X theirs upstream/${{ matrix.upstream_branch }}
+
+    - uses: peter-evans/create-pull-request@v5
+      with:
+        base: ${{ matrix.base_ref }}
+        title: 'Rebase onto upstream'
+        branch: 'rebase-${{ matrix.base_ref }}'
+        labels: automation
+        token: ${{ secrets.PAT_FOR_PR }}
diff --git a/.github/workflows/reset-on-merge.yml b/.github/workflows/reset-on-merge.yml
new file mode 100644
index 00000000000..7b4e40984a9
--- /dev/null
+++ b/.github/workflows/reset-on-merge.yml
@@ -0,0 +1,50 @@
+name: Reset on merge
+
+on:
+  pull_request:
+    types:
+    - closed
+
+jobs:
+  reset:
+
+    if: |
+      github.event.pull_request.merged == true &&
+      github.base_ref == 'akirak' &&
+      github.head_ref == 'rebase-akirak' &&
+      github.event.pull_request.head.repo.id == github.event.pull_request.base.repo.id
+
+    runs-on: ubuntu-latest
+
+    steps:
+
+    - uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+        ref: ${{ github.base_ref }}
+
+    - name: Tag the last head revision
+      id: backup
+      run: |
+        tag="${{ github.base_ref }}-backup-$(date +'%Y%m%d%H%M%S')"
+        git tag "$tag" "$(git rev-parse HEAD~1)"
+        echo "tag=$tag" >> "$GITHUB_OUTPUT"
+
+    - name: Push the tag
+      uses: ad-m/github-push-action@master
+      with:
+        tags: true
+        branch: ${{ steps.backup.outputs.tag }}
+
+    - name: Reset
+      run: |
+        git fetch origin "$rev"
+        git reset --hard "$rev"
+      env:
+        rev: ${{ github.head_ref }}
+
+    - name: Push the resetted branch
+      uses: ad-m/github-push-action@master
+      with:
+        branch: ${{ github.base_ref }}
+        force: true
diff --git a/.gitignore b/.gitignore
index baea9915e80..deff7f4c08a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,39 +2,21 @@
 *.elc
 *~
 .#*
-/.cask
-/.ecukes-failing-scenarios
-/config.el
 /config.mk
 /download_log.db
 /download_log.json.gz
 /download_log_stable.db
 /download_log_stable.json.gz
-/elpa
-/epkgs
-/html-snapshot/archive.json
-/html-snapshot/build-status.json
-/html-snapshot/download_counts.json
-/html-snapshot/recipes.json
-/html-snapshot/updates.rss
-/html-stable/archive.json
-/html-stable/build-status.json
-/html-stable/download_counts.json
-/html-stable/recipes.json
-/html-stable/updates.rss
-/html/archive.json
-/html/build-status.json
-/html/download_counts.json
-/html/recipes.json
-/html/updates.rss
-/packages-snapshot/
-/packages-stable/
-/packages/
+/html*/archive.json
+/html*/build-status.json
+/html*/download_counts.json
+/html*/recipes.json
+/html*/updates.rss
+/packages*/
 /process_log.pid
 /recipes/.dirstamp
 /sandbox
 /service/*/log
 /service/*/supervise
 /service/caddy/.caddy
-/sync
 /working/
diff --git a/package-build/Makefile b/package-build/Makefile
index be66ed9df2c..b5c7b230ddc 100644
--- a/package-build/Makefile
+++ b/package-build/Makefile
@@ -3,16 +3,24 @@ include default.mk
 
 .PHONY: test
 
+# https://github.com/emacscollective/workflows/blob/main/bin/install-deps
+# expects this to find this in this file.
+DEPS  = compat
+
 all: lisp
 
 help:
 	$(info make all          - generate byte-code and autoloads)
 	$(info make lisp         - generate byte-code and autoloads)
+	$(info make redo         - re-generate byte-code and autoloads)
 	$(info make test         - run tests)
 	$(info make demo         - run tests showing their documentation)
 	$(info make clean        - remove generated files)
 	@printf "\n"
 
+redo: clean $(ELCS) loaddefs check-declare
+	@$(MAKE) -C test lisp
+
 lisp: $(ELCS) loaddefs check-declare
 	@$(MAKE) -C test lisp
 
diff --git a/package-build/default.mk b/package-build/default.mk
index 6829fcf1094..9233d244382 100644
--- a/package-build/default.mk
+++ b/package-build/default.mk
@@ -8,7 +8,7 @@ ELS  += package-build.el
 ELS  += package-recipe-mode.el
 ELCS  = $(ELS:.el=.elc)
 
-DEPS  =
+DEPS  = compat
 
 VERSION ?= $(shell test -e $(TOP).git && git describe --tags --abbrev=0 | cut -c2-)
 
diff --git a/package-build/package-build-badges.el b/package-build/package-build-badges.el
index 6ef1f0362a7..1e29432c37d 100644
--- a/package-build/package-build-badges.el
+++ b/package-build/package-build-badges.el
@@ -1,8 +1,8 @@
 ;;; package-build-badges.el --- Create badges for packages  -*- lexical-binding:t; coding:utf-8 -*-
 
-;; Copyright (C) 2011-2023 Donald Ephraim Curtis
-;; Copyright (C) 2012-2023 Steve Purcell
-;; Copyright (C) 2018-2023 Jonas Bernoulli
+;; Copyright (C) 2011-2024 Donald Ephraim Curtis
+;; Copyright (C) 2012-2024 Steve Purcell
+;; Copyright (C) 2018-2024 Jonas Bernoulli
 ;; Copyright (C) 2021-2023 Free Software Foundation, Inc
 ;; Copyright (C) 2009 Phil Hagelberg
 
@@ -40,7 +40,7 @@
 This is essentially a copy of `elpaa--make-badge'."
   (let* ((file (expand-file-name (concat name "-badge.svg") target-dir))
          (left (or archive (car package-build-badge-data) "myElpa"))
-         (right (url-hexify-string version))
+         (right version)
          (color (or color (cadr package-build-badge-data) "#ff491b"))
          (lw (package-build-badge--string-width left))
          (rw (package-build-badge--string-width right))
diff --git a/package-build/package-build.el b/package-build/package-build.el
index 0bd0c8f5776..d9ba60d6bd5 100644
--- a/package-build/package-build.el
+++ b/package-build/package-build.el
@@ -1,8 +1,8 @@
 ;;; package-build.el --- Tools for assembling a package archive  -*- lexical-binding:t; coding:utf-8 -*-
 
-;; Copyright (C) 2011-2023 Donald Ephraim Curtis
-;; Copyright (C) 2012-2023 Steve Purcell
-;; Copyright (C) 2016-2023 Jonas Bernoulli
+;; Copyright (C) 2011-2024 Donald Ephraim Curtis
+;; Copyright (C) 2012-2024 Steve Purcell
+;; Copyright (C) 2016-2024 Jonas Bernoulli
 ;; Copyright (C) 2009 Phil Hagelberg
 
 ;; Author: Donald Ephraim Curtis <dcurtis@milkbox.net>
@@ -13,7 +13,7 @@
 ;; Keywords: maint tools
 
 ;; Package-Version: 4.0.0.50-git
-;; Package-Requires: ((emacs "26.1"))
+;; Package-Requires: ((emacs "26.1") (compat "27.1"))
 
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 
@@ -42,6 +42,7 @@
 ;;; Code:
 
 (require 'cl-lib)
+(require 'compat nil t)
 (require 'pcase)
 (require 'subr-x)
 
@@ -405,7 +406,7 @@ main library to a version that qualifies as a release, ignoring
 any pre-releases.
 
 Return (COMMIT-HASH COMMITTER-DATE VERSION-STRING)."
-  (when-let ((lib (package-build--main-library rcp)))
+  (and-let* ((lib (package-build--main-library rcp)))
     (with-temp-buffer
       (let (commit date version)
         (save-excursion
@@ -466,7 +467,7 @@ Return (COMMIT-HASH COMMITTER-DATE VERSION-STRING)."
 (defun package-build-pkg-version (rcp)
   "Return version specified in the \"NAME-pkg.el\" file.
 Return (COMMIT-HASH COMMITTER-DATE VERSION-STRING)."
-  (when-let ((file (package-build--pkgfile rcp)))
+  (and-let* ((file (package-build--pkgfile rcp)))
     (let ((regexp (or (oref rcp version-regexp) package-build-version-regexp))
           commit date version)
       (catch 'before-latest
@@ -1075,7 +1076,7 @@ value specified in the file \"NAME.el\"."
                  (if (fboundp 'lm-maintainers)
                      (lm-maintainers)
                    (with-no-warnings
-                     (when-let ((maintainer (lm-maintainer)))
+                     (and-let* ((maintainer (lm-maintainer)))
                        (list maintainer)))))
            (package-desc-from-define
             name version
@@ -1085,10 +1086,15 @@ value specified in the file \"NAME.el\"."
 ^;;; [^ ]*\\.el ---[ \t]*\\(.*?\\)[ \t]*\\(-\\*-.*-\\*-[ \t]*\\)?$" nil t)
                        (match-string-no-properties 1)))
                 "No description available.")
-            (when-let ((require-lines (lm-header-multiline "package-requires")))
-              (package--prepare-dependencies
-               (package-read-from-string
-                (mapconcat #'identity require-lines " "))))
+            (cond
+             ((fboundp 'lm-package-requires)
+              (lm-package-requires))
+             ((fboundp 'package--prepare-dependencies)
+              (and-let* ((require-lines
+                          (lm-header-multiline "package-requires")))
+                (package--prepare-dependencies
+                 (package-read-from-string
+                  (mapconcat #'identity require-lines " "))))))
             ;; `:kind' and `:archive' are handled separately.
             :kind       (or kind 'single)
             ;; The other keyword arguments are appended to the alist
@@ -1569,15 +1575,15 @@ If optional PRETTY-PRINT is non-nil, then pretty-print
           ;; section "Specifications (elpa-packages)" in "README" of the
           ;; "elpa-admin" branch in "emacs/elpa.git" repository; and also
           ;; `elpaa--supported-keywords' and `elpaa--publish-package-spec'.
-          (let ((recipe (package-recipe-lookup name)))
-            (push
-             `(,symbol
-               :url ,(package-recipe--upstream-url recipe)
-               ,@(and (cl-typep recipe 'package-hg-recipe)
-                      (list :vc-backend 'Hg))
-               ,@(when-let* ((branch (oref recipe branch)))
-                   (list :branch branch)))
-             vc-pkgs))))))
+          (and-let* ((recipe (with-demoted-errors "Recipe error: %S"
+                               (package-recipe-lookup name))))
+            (push `(,symbol
+                    :url ,(package-recipe--upstream-url recipe)
+                    ,@(and (cl-typep recipe 'package-hg-recipe)
+                           (list :vc-backend 'Hg))
+                    ,@(and-let* ((branch (oref recipe branch)))
+                        (list :branch branch)))
+                  vc-pkgs))))))
     (setq entries (cl-sort entries #'string< :key #'car))
     (with-temp-file (or file (expand-file-name "archive-contents"))
       (let ((print-level nil)
@@ -1646,7 +1652,7 @@ a package."
      (json-encode
       (cl-mapcan
        (lambda (name)
-         (ignore-errors ; Silently ignore corrupted recipes.
+         (with-demoted-errors "Recipe error: %S"
            (and (package-recipe-lookup name)
                 (with-temp-buffer
                   (insert-file-contents
diff --git a/package-build/package-recipe-mode.el b/package-build/package-recipe-mode.el
index 813ae3a50a1..832336b3038 100644
--- a/package-build/package-recipe-mode.el
+++ b/package-build/package-recipe-mode.el
@@ -1,8 +1,8 @@
 ;;; package-recipe-mode.el --- Major-mode for editing package recipes  -*- lexical-binding:t; coding:utf-8 -*-
 
-;; Copyright (C) 2011-2023 Donald Ephraim Curtis
-;; Copyright (C) 2012-2023 Steve Purcell
-;; Copyright (C) 2016-2023 Jonas Bernoulli
+;; Copyright (C) 2011-2024 Donald Ephraim Curtis
+;; Copyright (C) 2012-2024 Steve Purcell
+;; Copyright (C) 2016-2024 Jonas Bernoulli
 ;; Copyright (C) 2009 Phil Hagelberg
 
 ;; Author: Donald Ephraim Curtis <dcurtis@milkbox.net>
diff --git a/package-build/package-recipe.el b/package-build/package-recipe.el
index 7b3909fbe7d..be0aeff4b17 100644
--- a/package-build/package-recipe.el
+++ b/package-build/package-recipe.el
@@ -1,6 +1,6 @@
 ;;; package-recipe.el --- Package recipes as EIEIO objects  -*- lexical-binding:t; coding:utf-8 -*-
 
-;; Copyright (C) 2018-2023 Jonas Bernoulli
+;; Copyright (C) 2018-2024 Jonas Bernoulli
 
 ;; Author: Jonas Bernoulli <jonas@bernoul.li>
 ;; Homepage: https://github.com/melpa/package-build
@@ -27,6 +27,7 @@
 
 ;;; Code:
 
+(require 'compat nil t)
 (require 'eieio)
 (require 'subr-x)
 (require 'url-parse)
@@ -182,17 +183,14 @@ file is invalid, then raise an error."
               (cl-assert (not (plist-get plist :url)) ":url is redundant"))
           (cl-assert (plist-get plist :url) ":url is missing")))
       (dolist (key symbol-keys)
-        (let ((val (plist-get plist key)))
-          (when val
-            (cl-assert (symbolp val) nil "%s must be a symbol but is %S" key val))))
+        (when-let ((val (plist-get plist key)))
+          (cl-assert (symbolp val) nil "%s must be a symbol but is %S" key val)))
       (dolist (key list-keys)
-        (let ((val (plist-get plist key)))
-          (when val
-            (cl-assert (listp val) nil "%s must be a list but is %S" key val))))
+        (when-let ((val (plist-get plist key)))
+          (cl-assert (listp val) nil "%s must be a list but is %S" key val)))
       (dolist (key string-keys)
-        (let ((val (plist-get plist key)))
-          (when val
-            (cl-assert (stringp val) nil "%s must be a string but is %S" key val))))
+        (when-let ((val (plist-get plist key)))
+          (cl-assert (stringp val) nil "%s must be a string but is %S" key val)))
       (when-let ((spec (plist-get plist :files)))
         ;; `:defaults' is only allowed as the first element.
         ;; If we find it in that position, skip over it.
diff --git a/recipes/acm b/recipes/acm
new file mode 100644
index 00000000000..84405b59a7d
--- /dev/null
+++ b/recipes/acm
@@ -0,0 +1,2 @@
+(acm :fetcher github :repo "manateelazycat/lsp-bridge"
+     :files ("acm/*.el" "acm/icons"))
diff --git a/recipes/afterglow b/recipes/afterglow
new file mode 100644
index 00000000000..747a8c6498d
--- /dev/null
+++ b/recipes/afterglow
@@ -0,0 +1,2 @@
+(afterglow :fetcher github
+           :repo "ernstvanderlinden/emacs-afterglow")
diff --git a/recipes/akirak b/recipes/akirak
new file mode 100644
index 00000000000..d3212b660db
--- /dev/null
+++ b/recipes/akirak
@@ -0,0 +1,2 @@
+(akirak :fetcher github :repo "akirak/emacs-config"
+        :files ("emacs/lisp/*.el"))
diff --git a/recipes/app-monochrome-themes b/recipes/app-monochrome-themes
new file mode 100644
index 00000000000..3364ad7f8ec
--- /dev/null
+++ b/recipes/app-monochrome-themes
@@ -0,0 +1,3 @@
+(app-monochrome-themes
+ :fetcher github
+ :repo "Greybeard-Entertainment/app-monochrome")
diff --git a/recipes/apprentice b/recipes/apprentice
new file mode 100644
index 00000000000..587fe826878
--- /dev/null
+++ b/recipes/apprentice
@@ -0,0 +1 @@
+(apprentice :fetcher github :repo "Sasanidas/Apprentice")
diff --git a/recipes/avy-riben b/recipes/avy-riben
new file mode 100644
index 00000000000..93b815b2854
--- /dev/null
+++ b/recipes/avy-riben
@@ -0,0 +1,2 @@
+(avy-riben :fetcher github :repo "akirak/emacs-dumb-japanese"
+           :files ("avy-riben.el"))
diff --git a/recipes/beancount b/recipes/beancount
new file mode 100644
index 00000000000..dece931e30c
--- /dev/null
+++ b/recipes/beancount
@@ -0,0 +1 @@
+(beancount :fetcher github :repo "beancount/beancount-mode")
\ No newline at end of file
diff --git a/recipes/benchmark-init b/recipes/benchmark-init
index 340b7683a19..bdb3be1ba56 100644
--- a/recipes/benchmark-init
+++ b/recipes/benchmark-init
@@ -1 +1,6 @@
-(benchmark-init :fetcher github :repo "dholm/benchmark-init-el")
+;; I initially intended to use this fork until a bugfix PR is merged.
+;;
+;; However, I added another patch which further enhances the package,
+;; so I probably won't switch back to the original.
+;; https://github.com/akirak/benchmark-init-el/commit/cc16e08c3d3a6e0044046b74c3f6544e46250d4a
+(benchmark-init :fetcher github :repo "akirak/benchmark-init-el")
\ No newline at end of file
diff --git a/recipes/bfmt b/recipes/bfmt
new file mode 100644
index 00000000000..ae5db935f22
--- /dev/null
+++ b/recipes/bfmt
@@ -0,0 +1 @@
+(bfmt :fetcher github :repo "akirak/bfmt.el")
diff --git a/recipes/chatgpt b/recipes/chatgpt
new file mode 100644
index 00000000000..88701f28298
--- /dev/null
+++ b/recipes/chatgpt
@@ -0,0 +1 @@
+(chatgpt :fetcher github :repo "joshcho/ChatGPT.el")
diff --git a/recipes/chatu b/recipes/chatu
new file mode 100644
index 00000000000..bc586f93902
--- /dev/null
+++ b/recipes/chatu
@@ -0,0 +1 @@
+(chatu :repo "kimim/chatu" :fetcher github)
diff --git a/recipes/clipsave b/recipes/clipsave
new file mode 100644
index 00000000000..6987f4c6318
--- /dev/null
+++ b/recipes/clipsave
@@ -0,0 +1,2 @@
+(clipurl :fetcher github :repo "akirak/clipurl.el"
+         :files ("clipsave.el"))
diff --git a/recipes/clipurl b/recipes/clipurl
new file mode 100644
index 00000000000..c3ef7a93f13
--- /dev/null
+++ b/recipes/clipurl
@@ -0,0 +1,2 @@
+(clipurl :fetcher github :repo "akirak/clipurl.el"
+         :files ("clipurl.el"))
diff --git a/recipes/codeium b/recipes/codeium
new file mode 100644
index 00000000000..6aca3609af8
--- /dev/null
+++ b/recipes/codeium
@@ -0,0 +1 @@
+(codeium :fetcher github :repo "Exafunction/codeium.el")
diff --git a/recipes/consult-org-dog b/recipes/consult-org-dog
new file mode 100644
index 00000000000..097fab88001
--- /dev/null
+++ b/recipes/consult-org-dog
@@ -0,0 +1,2 @@
+(consult-org-dog :fetcher github :repo "akirak/org-dog"
+                 :files ("extra/consult-org-dog.el"))
diff --git a/recipes/consult-org-nlink b/recipes/consult-org-nlink
new file mode 100644
index 00000000000..cb2571b78cd
--- /dev/null
+++ b/recipes/consult-org-nlink
@@ -0,0 +1,2 @@
+(consult-org-nlink :fetcher github :repo "akirak/org-nlink.el"
+                   :files ("consult-org-nlink.el"))
diff --git a/recipes/copilot b/recipes/copilot
new file mode 100644
index 00000000000..85216bb7bdb
--- /dev/null
+++ b/recipes/copilot
@@ -0,0 +1 @@
+(copilot :fetcher github :repo "zerolfx/copilot.el" :files ("dist" "*.el"))
diff --git a/recipes/dape b/recipes/dape
new file mode 100644
index 00000000000..9ee1015606f
--- /dev/null
+++ b/recipes/dape
@@ -0,0 +1 @@
+(dape :fetcher github :repo "svaante/dape")
diff --git a/recipes/dash-docs b/recipes/dash-docs
index e573b5219c9..195b95299ea 100644
--- a/recipes/dash-docs
+++ b/recipes/dash-docs
@@ -1,2 +1,3 @@
 (dash-docs :repo "dash-docs-el/dash-docs"
-                 :fetcher github)
+           :fetcher github
+           :files (:defaults (:exclude "use-package-dash-docs.el")))
diff --git a/recipes/deno-ts-mode b/recipes/deno-ts-mode
index 55f29c6ac17..02002deceb6 100644
--- a/recipes/deno-ts-mode
+++ b/recipes/deno-ts-mode
@@ -1,3 +1,3 @@
 (deno-ts-mode
- :fetcher sourcehut
+ :fetcher github
  :repo "mgmarlow/deno-ts-mode")
diff --git a/recipes/dired-auto-readme b/recipes/dired-auto-readme
new file mode 100644
index 00000000000..c59571a399b
--- /dev/null
+++ b/recipes/dired-auto-readme
@@ -0,0 +1 @@
+(dired-auto-readme :fetcher github :repo "amno1/dired-auto-readme")
diff --git a/recipes/duckduckgo b/recipes/duckduckgo
new file mode 100644
index 00000000000..6ac76d86cd5
--- /dev/null
+++ b/recipes/duckduckgo
@@ -0,0 +1 @@
+(duckduckgo :fetcher github :repo "akirak/duckduckgo.el")
diff --git a/recipes/eglot-x b/recipes/eglot-x
new file mode 100644
index 00000000000..3931ad6c914
--- /dev/null
+++ b/recipes/eglot-x
@@ -0,0 +1 @@
+(eglot-x :fetcher github :repo "nemethf/eglot-x")
diff --git a/recipes/embark-org b/recipes/embark-org
new file mode 100644
index 00000000000..4bf2233bd0f
--- /dev/null
+++ b/recipes/embark-org
@@ -0,0 +1,2 @@
+(embark-org :fetcher github :repo "oantolin/embark"
+            :files ("embark-org.el"))
\ No newline at end of file
diff --git a/recipes/embark-org-roam b/recipes/embark-org-roam
new file mode 100644
index 00000000000..4057137b078
--- /dev/null
+++ b/recipes/embark-org-roam
@@ -0,0 +1 @@
+(embark-org-roam :fetcher github :repo "bramadams/embark-org-roam")
diff --git a/recipes/emms-player-spotify b/recipes/emms-player-spotify
new file mode 100644
index 00000000000..8ac213d459d
--- /dev/null
+++ b/recipes/emms-player-spotify
@@ -0,0 +1 @@
+(emms-player-spotify :fetcher github :repo "sarg/emms-spotify")
diff --git a/recipes/eshell-outline b/recipes/eshell-outline
index e57ce28a104..026098b48ce 100644
--- a/recipes/eshell-outline
+++ b/recipes/eshell-outline
@@ -1 +1 @@
-(eshell-outline :fetcher git :url "https://git.jamzattack.xyz/eshell-outline")
+(eshell-outline :fetcher github :repo "emacsattic/eshell-outline")
diff --git a/recipes/eval-in-repl b/recipes/eval-in-repl
index 365594ce859..a15ed5315d7 100644
--- a/recipes/eval-in-repl
+++ b/recipes/eval-in-repl
@@ -1,3 +1,3 @@
-(eval-in-repl :fetcher github
-              :repo    "kaz-yos/eval-in-repl"
-              :commit  "origin/master")
+;; Override the recipe because :commit "origin/master"
+;; is problematic in the Nix fetcher
+(eval-in-repl :fetcher github :repo "kaz-yos/eval-in-repl")
\ No newline at end of file
diff --git a/recipes/evil-lispy b/recipes/evil-lispy
index d23373cbc07..ae92e92e4ce 100644
--- a/recipes/evil-lispy
+++ b/recipes/evil-lispy
@@ -1,2 +1,2 @@
-(evil-lispy :repo "sp3ctum/evil-lispy"
+(evil-lispy :repo "mikavilpas/evil-lispy"
             :fetcher github)
diff --git a/recipes/flymake-actionlint1 b/recipes/flymake-actionlint1
new file mode 100644
index 00000000000..95734962c71
--- /dev/null
+++ b/recipes/flymake-actionlint1
@@ -0,0 +1 @@
+(flymake-actionlint1 :fetcher github :repo "akirak/flymake-actionlint1")
diff --git a/recipes/flymake-clippy b/recipes/flymake-clippy
index 8873935d483..b20f403dd2d 100644
--- a/recipes/flymake-clippy
+++ b/recipes/flymake-clippy
@@ -1,3 +1,3 @@
 (flymake-clippy
- :fetcher sourcehut
+ :fetcher github
  :repo "mgmarlow/flymake-clippy")
diff --git a/recipes/flymake-fennel b/recipes/flymake-fennel
index cb873930cd4..2b88f2cedc3 100644
--- a/recipes/flymake-fennel
+++ b/recipes/flymake-fennel
@@ -1,3 +1,3 @@
 (flymake-fennel
- :fetcher sourcehut
+ :fetcher github
  :repo "mgmarlow/flymake-fennel")
diff --git a/recipes/flymake-golangci b/recipes/flymake-golangci
index 8f4943a0585..8da2500e933 100644
--- a/recipes/flymake-golangci
+++ b/recipes/flymake-golangci
@@ -1 +1 @@
-(flymake-golangci :fetcher gitlab :repo "shackra/flymake-golangci")
+(flymake-golangci :fetcher github :repo "emacsattic/flymake-golangci")
diff --git a/recipes/fmo-mode b/recipes/fmo-mode
new file mode 100644
index 00000000000..7cd11fea7c5
--- /dev/null
+++ b/recipes/fmo-mode
@@ -0,0 +1 @@
+(fmo-mode :fetcher github :repo "xeechou/fmo-mode.el")
\ No newline at end of file
diff --git a/recipes/ghelp b/recipes/ghelp
new file mode 100644
index 00000000000..872dda911fa
--- /dev/null
+++ b/recipes/ghelp
@@ -0,0 +1,2 @@
+(ghelp :fetcher github :repo "casouri/ghelp"
+       :files (:defaults (:exclude "ghelp-*.el") "ghelp-builtin.el"))
diff --git a/recipes/ghelp-eglot b/recipes/ghelp-eglot
new file mode 100644
index 00000000000..c3b5ccd4628
--- /dev/null
+++ b/recipes/ghelp-eglot
@@ -0,0 +1,2 @@
+(ghelp :fetcher github :repo "casouri/ghelp"
+       :files ("ghelp-eglot.el"))
diff --git a/recipes/ghelp-geiser b/recipes/ghelp-geiser
new file mode 100644
index 00000000000..6f1bd41e14c
--- /dev/null
+++ b/recipes/ghelp-geiser
@@ -0,0 +1,2 @@
+(ghelp :fetcher github :repo "casouri/ghelp"
+       :files ("ghelp-geiser.el"))
diff --git a/recipes/ghelp-helpful b/recipes/ghelp-helpful
new file mode 100644
index 00000000000..23091221ef4
--- /dev/null
+++ b/recipes/ghelp-helpful
@@ -0,0 +1,2 @@
+(ghelp :fetcher github :repo "casouri/ghelp"
+       :files ("ghelp-helpful.el"))
diff --git a/recipes/ghelp-sly b/recipes/ghelp-sly
new file mode 100644
index 00000000000..91c52b87f35
--- /dev/null
+++ b/recipes/ghelp-sly
@@ -0,0 +1,2 @@
+(ghelp :fetcher github :repo "casouri/ghelp"
+       :files ("ghelp-sly.el"))
\ No newline at end of file
diff --git a/recipes/gleam-mode b/recipes/gleam-mode
new file mode 100644
index 00000000000..cc68db21a2c
--- /dev/null
+++ b/recipes/gleam-mode
@@ -0,0 +1 @@
+(gleam-mode :fetcher github :repo "gleam-lang/gleam-mode")
diff --git a/recipes/gleam-ts-mode b/recipes/gleam-ts-mode
new file mode 100644
index 00000000000..c0a5baeb593
--- /dev/null
+++ b/recipes/gleam-ts-mode
@@ -0,0 +1,2 @@
+(gleam-ts-mode :fetcher github :repo "gleam-lang/gleam-mode"
+               :branch "gleam-ts-mode")
diff --git a/recipes/grammatical-edit b/recipes/grammatical-edit
new file mode 100644
index 00000000000..d09f8d8de14
--- /dev/null
+++ b/recipes/grammatical-edit
@@ -0,0 +1 @@
+(grammatical-edit :fetcher github :repo "manateelazycat/grammatical-edit")
diff --git a/recipes/haskell-tng-mode b/recipes/haskell-tng-mode
new file mode 100644
index 00000000000..be84670d15e
--- /dev/null
+++ b/recipes/haskell-tng-mode
@@ -0,0 +1,3 @@
+(haskell-tng-mode :fetcher gitlab :repo "tseenshe/haskell-tng.el"
+                  :branch "tng"
+                  :files ("*.el" (:exclude "haskell-tng-extra-*.el")))
\ No newline at end of file
diff --git a/recipes/huan b/recipes/huan
new file mode 100644
index 00000000000..26ec13ff0af
--- /dev/null
+++ b/recipes/huan
@@ -0,0 +1 @@
+(huan :fetcher github :repo "akirak/huan.el")
diff --git a/recipes/indent-bars b/recipes/indent-bars
new file mode 100644
index 00000000000..ce17c48b63f
--- /dev/null
+++ b/recipes/indent-bars
@@ -0,0 +1 @@
+(indent-bars :fetcher github :repo "jdtsmith/indent-bars")
diff --git a/recipes/insert-translated-name b/recipes/insert-translated-name
new file mode 100644
index 00000000000..2e836388f5d
--- /dev/null
+++ b/recipes/insert-translated-name
@@ -0,0 +1 @@
+(insert-translated-name :fetcher github :repo "manateelazycat/insert-translated-name")
diff --git a/recipes/jtsx b/recipes/jtsx
index 0b669f57ae7..7879ec848b7 100644
--- a/recipes/jtsx
+++ b/recipes/jtsx
@@ -1,3 +1 @@
-(jtsx
- :fetcher github
- :repo "llemaitre19/jtsx")
+(jtsx :fetcher github :repo "llemaitre19/jtsx")
diff --git a/recipes/lean4-mode b/recipes/lean4-mode
new file mode 100644
index 00000000000..51e9fb59aff
--- /dev/null
+++ b/recipes/lean4-mode
@@ -0,0 +1,2 @@
+(lean4-mode :fetcher github :repo "leanprover/lean4-mode"
+            :files (:defaults ("data" "data/*.json")))
diff --git a/recipes/lsp-bridge b/recipes/lsp-bridge
new file mode 100644
index 00000000000..610779aff81
--- /dev/null
+++ b/recipes/lsp-bridge
@@ -0,0 +1,11 @@
+;; This recipe was taken from https://github.com/akirak/nixpkgs/blob/a790cc526b488cf5d9966e9a45d2f4d2a92963a5/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix
+(lsp-bridge
+ :repo "manateelazycat/lsp-bridge"
+ :fetcher github
+ :files
+ ("*.el"
+  "lsp_bridge.py"
+  "core"
+  "langserver"
+  "multiserver"
+  "resources"))
diff --git a/recipes/magit-gptcommit b/recipes/magit-gptcommit
new file mode 100644
index 00000000000..d3518cefeaa
--- /dev/null
+++ b/recipes/magit-gptcommit
@@ -0,0 +1 @@
+(magit-gptcommit :fetcher github :repo "douo/magit-gptcommit")
diff --git a/recipes/magit-nix3 b/recipes/magit-nix3
new file mode 100644
index 00000000000..386114b71cc
--- /dev/null
+++ b/recipes/magit-nix3
@@ -0,0 +1,2 @@
+(magit-nix3 :fetcher github :repo "emacs-twist/nix3.el"
+            :files ("extra/magit-nix3.el"))
diff --git a/recipes/mode-minder b/recipes/mode-minder
new file mode 100644
index 00000000000..660259ab6b1
--- /dev/null
+++ b/recipes/mode-minder
@@ -0,0 +1 @@
+(mode-minder :fetcher github :repo "jdtsmith/mode-minder")
\ No newline at end of file
diff --git a/recipes/nano-theme b/recipes/nano-theme
new file mode 100644
index 00000000000..bb62abb65ac
--- /dev/null
+++ b/recipes/nano-theme
@@ -0,0 +1 @@
+(nano-theme :fetcher github :repo "rougier/nano-theme")
\ No newline at end of file
diff --git a/recipes/nix3 b/recipes/nix3
new file mode 100644
index 00000000000..a2575b2e25a
--- /dev/null
+++ b/recipes/nix3
@@ -0,0 +1 @@
+(nix3 :fetcher github :repo "emacs-twist/nix3.el")
diff --git a/recipes/nordic-night-theme b/recipes/nordic-night-theme
index 7d82fa70a43..4c4e81056ad 100644
--- a/recipes/nordic-night-theme
+++ b/recipes/nordic-night-theme
@@ -1 +1 @@
-(nordic-night-theme :fetcher git :url "https://codeberg.org/ashton314/nordic-night")
+(nordic-night-theme :fetcher codeberg :repo "ashton314/nordic-night")
diff --git a/recipes/notebook b/recipes/notebook
new file mode 100644
index 00000000000..3cfcc4c23ce
--- /dev/null
+++ b/recipes/notebook
@@ -0,0 +1 @@
+(notebook :fetcher github :repo "rougier/notebook-mode")
diff --git a/recipes/oahu b/recipes/oahu
new file mode 100644
index 00000000000..4bbcb6370fa
--- /dev/null
+++ b/recipes/oahu
@@ -0,0 +1 @@
+(oahu :fetcher github :repo "akirak/oahu.el")
diff --git a/recipes/oahu-memento b/recipes/oahu-memento
new file mode 100644
index 00000000000..cf8f5f8765a
--- /dev/null
+++ b/recipes/oahu-memento
@@ -0,0 +1,2 @@
+(oahu-memento :fetcher github :repo "akirak/oahu.el"
+              :files ("extra/oahu-memento.el"))
diff --git a/recipes/octopus b/recipes/octopus
new file mode 100644
index 00000000000..9e0cc0d7a7f
--- /dev/null
+++ b/recipes/octopus
@@ -0,0 +1,2 @@
+(octopus :fetcher github :repo "akirak/org-dog"
+         :files ("extra/octopus.el"))
\ No newline at end of file
diff --git a/recipes/org-bb b/recipes/org-bb
new file mode 100644
index 00000000000..25b5dc9d544
--- /dev/null
+++ b/recipes/org-bb
@@ -0,0 +1 @@
+(org-bb :fetcher github :repo "akirak/org-blockers-block")
diff --git a/recipes/org-caldav b/recipes/org-caldav
index 316879af34d..e7b9ebd0316 100644
--- a/recipes/org-caldav
+++ b/recipes/org-caldav
@@ -1,4 +1,3 @@
 (org-caldav
  :repo "dengste/org-caldav"
- :fetcher github
- :files ("org-caldav.el"))
+ :fetcher github)
diff --git a/recipes/org-clock-agenda-daytime-mode b/recipes/org-clock-agenda-daytime-mode
new file mode 100644
index 00000000000..afe5851e5b1
--- /dev/null
+++ b/recipes/org-clock-agenda-daytime-mode
@@ -0,0 +1 @@
+(org-clock-agenda-daytime-mode :repo "ArneBab/emacs-org-clock-daytime" :fetcher github)
diff --git a/recipes/org-dog b/recipes/org-dog
new file mode 100644
index 00000000000..204516a5da4
--- /dev/null
+++ b/recipes/org-dog
@@ -0,0 +1 @@
+(org-dog :fetcher github :repo "akirak/org-dog")
diff --git a/recipes/org-dog-embark b/recipes/org-dog-embark
new file mode 100644
index 00000000000..97865a51e53
--- /dev/null
+++ b/recipes/org-dog-embark
@@ -0,0 +1,2 @@
+(org-dog-embark :fetcher github :repo "akirak/org-dog"
+                :files ("extra/org-dog-embark.el"))
diff --git a/recipes/org-dog-export b/recipes/org-dog-export
new file mode 100644
index 00000000000..5624086bd29
--- /dev/null
+++ b/recipes/org-dog-export
@@ -0,0 +1,2 @@
+(org-dog-export :fetcher github :repo "akirak/org-dog"
+                :files ("extra/org-dog-export.el"))
\ No newline at end of file
diff --git a/recipes/org-dog-facade b/recipes/org-dog-facade
new file mode 100644
index 00000000000..9df27dc18fa
--- /dev/null
+++ b/recipes/org-dog-facade
@@ -0,0 +1,3 @@
+(org-dog-facade :fetcher github :repo "akirak/org-dog"
+                :files ("extra/org-dog-facade.el"
+                        "extra/org-dog-datetree.el"))
diff --git a/recipes/org-dynamic-bullets b/recipes/org-dynamic-bullets
new file mode 100644
index 00000000000..081e68b9d46
--- /dev/null
+++ b/recipes/org-dynamic-bullets
@@ -0,0 +1,2 @@
+(org-dynamic-bullets :fetcher github :repo "legalnonsense/org-visual-outline"
+                     :files ("org-dynamic-bullets.el"))
\ No newline at end of file
diff --git a/recipes/org-epubinfo b/recipes/org-epubinfo
new file mode 100644
index 00000000000..b9444336c20
--- /dev/null
+++ b/recipes/org-epubinfo
@@ -0,0 +1 @@
+(org-epubinfo :fetcher github :repo "akirak/org-epubinfo")
diff --git a/recipes/org-excalidraw b/recipes/org-excalidraw
new file mode 100644
index 00000000000..4452a17a522
--- /dev/null
+++ b/recipes/org-excalidraw
@@ -0,0 +1 @@
+(org-excalidraw :fetcher github :repo "wdavew/org-excalidraw")
\ No newline at end of file
diff --git a/recipes/org-hyprctl b/recipes/org-hyprctl
new file mode 100644
index 00000000000..44d8cd332de
--- /dev/null
+++ b/recipes/org-hyprctl
@@ -0,0 +1 @@
+(org-hyprctl :fetcher github :repo "akirak/org-hyprctl")
diff --git a/recipes/org-lang-env b/recipes/org-lang-env
new file mode 100644
index 00000000000..fd0c2a5d6c3
--- /dev/null
+++ b/recipes/org-lang-env
@@ -0,0 +1 @@
+(org-lang-env :fetcher github :repo "akirak/org-lang-env")
\ No newline at end of file
diff --git a/recipes/org-linker b/recipes/org-linker
new file mode 100644
index 00000000000..956ddcfcbcd
--- /dev/null
+++ b/recipes/org-linker
@@ -0,0 +1 @@
+(org-linker :repo "toshism/org-linker" :fetcher github)
\ No newline at end of file
diff --git a/recipes/org-linker-edna b/recipes/org-linker-edna
new file mode 100644
index 00000000000..13f85567679
--- /dev/null
+++ b/recipes/org-linker-edna
@@ -0,0 +1 @@
+(org-linker-edna :repo "toshism/org-linker-edna" :fetcher github)
diff --git a/recipes/org-memento b/recipes/org-memento
new file mode 100644
index 00000000000..1438f312970
--- /dev/null
+++ b/recipes/org-memento
@@ -0,0 +1 @@
+(org-memento :fetcher github :repo "akirak/org-memento")
diff --git a/recipes/org-nlink b/recipes/org-nlink
new file mode 100644
index 00000000000..a38680868be
--- /dev/null
+++ b/recipes/org-nlink
@@ -0,0 +1,2 @@
+(org-nlink :fetcher github :repo "akirak/org-nlink.el"
+           :files (:defaults (:exclude "consult-org-nlink.el")))
diff --git a/recipes/org-pivot-search b/recipes/org-pivot-search
new file mode 100644
index 00000000000..55c53f95153
--- /dev/null
+++ b/recipes/org-pivot-search
@@ -0,0 +1 @@
+(org-pivot-search :fetcher github :repo "akirak/org-pivot-search")
diff --git a/recipes/org-placeholder b/recipes/org-placeholder
new file mode 100644
index 00000000000..415aa6a71c0
--- /dev/null
+++ b/recipes/org-placeholder
@@ -0,0 +1 @@
+(org-placeholder :fetcher github :repo "akirak/org-placeholder")
diff --git a/recipes/org-pretty-table b/recipes/org-pretty-table
new file mode 100644
index 00000000000..f1324ef8dc0
--- /dev/null
+++ b/recipes/org-pretty-table
@@ -0,0 +1 @@
+(org-pretty-table :fetcher github :repo "Fuco1/org-pretty-table")
diff --git a/recipes/org-super-links b/recipes/org-super-links
new file mode 100644
index 00000000000..c211de9c683
--- /dev/null
+++ b/recipes/org-super-links
@@ -0,0 +1,2 @@
+(org-super-links :fetcher github :repo "toshism/org-super-links"
+                 :files ("org-super-links.el"))
\ No newline at end of file
diff --git a/recipes/org-vcard b/recipes/org-vcard
index 80e98a44f32..9e9068a8c7b 100644
--- a/recipes/org-vcard
+++ b/recipes/org-vcard
@@ -1,5 +1,5 @@
 (org-vcard
  :fetcher github
- :repo "flexibeast/org-vcard"
+ :repo "pinoaffe/org-vcard"
  :files ("org-vcard.el"
          "styles"))
diff --git a/recipes/org-visual-indent b/recipes/org-visual-indent
new file mode 100644
index 00000000000..d14aefed2ba
--- /dev/null
+++ b/recipes/org-visual-indent
@@ -0,0 +1,2 @@
+(org-visual-indent :fetcher github :repo "legalnonsense/org-visual-outline"
+                   :files ("org-visual-indent.el"))
\ No newline at end of file
diff --git a/recipes/org-volume b/recipes/org-volume
new file mode 100644
index 00000000000..38d39887d3f
--- /dev/null
+++ b/recipes/org-volume
@@ -0,0 +1 @@
+(org-volume :fetcher github :repo "akirak/org-volume")
\ No newline at end of file
diff --git a/recipes/orgabilize b/recipes/orgabilize
new file mode 100644
index 00000000000..8cfe40e3757
--- /dev/null
+++ b/recipes/orgabilize
@@ -0,0 +1 @@
+(orgabilize :fetcher github :repo "akirak/orgabilize.el")
diff --git a/recipes/ox-impress-js b/recipes/ox-impress-js
index 3ada9a0fc95..f43226796c6 100644
--- a/recipes/ox-impress-js
+++ b/recipes/ox-impress-js
@@ -1,4 +1,4 @@
 (ox-impress-js :fetcher github
-               :repo "takumikinjo/org-impress-js.el"
+               :repo "emacsattic/org-impress-js"
                :files ("*.el" "resources")
                :old-names (org-impress-js))
diff --git a/recipes/pdf-tools b/recipes/pdf-tools
index c5e85ff9db6..79e8039dcc1 100644
--- a/recipes/pdf-tools
+++ b/recipes/pdf-tools
@@ -1,7 +1,3 @@
 (pdf-tools
- :fetcher github
- :repo "vedang/pdf-tools"
- :files (:defaults
-         "README"
-         ("build" "Makefile")
-         ("build" "server")))
+ :repo "vedang/pdf-tools" :fetcher github
+ :files (:defaults "Makefile" "lisp" "server"))
diff --git a/recipes/poly-astro b/recipes/poly-astro
new file mode 100644
index 00000000000..f0ebf851a08
--- /dev/null
+++ b/recipes/poly-astro
@@ -0,0 +1 @@
+(poly-astro :fetcher github :repo "pablo-abc/poly-astro")
\ No newline at end of file
diff --git a/recipes/protobuf-ts-mode b/recipes/protobuf-ts-mode
index d8aede4e565..2bbbcf6e7be 100644
--- a/recipes/protobuf-ts-mode
+++ b/recipes/protobuf-ts-mode
@@ -1 +1 @@
-(protobuf-ts-mode :fetcher git :url "https://git.ookami.one/cgit/protobuf-ts-mode")
+(protobuf-ts-mode :fetcher github :repo "emacsattic/protobuf-ts-mode")
diff --git a/recipes/pyim-cangjiedict b/recipes/pyim-cangjiedict
index 54f2ddec7ca..c0ffae33699 100644
--- a/recipes/pyim-cangjiedict
+++ b/recipes/pyim-cangjiedict
@@ -1,4 +1,4 @@
 (pyim-cangjiedict
  :fetcher github
- :repo "ba11aStone/pyim-cangjiedict"
+ :repo "con5tella/pyim-cangjiedict"
  :files (:defaults "*.pyim"))
diff --git a/recipes/pyim-smzmdict b/recipes/pyim-smzmdict
index 7bc6abaea1b..bf778fd73f4 100644
--- a/recipes/pyim-smzmdict
+++ b/recipes/pyim-smzmdict
@@ -1,4 +1,4 @@
 (pyim-smzmdict
  :fetcher github
- :repo "ba11aStone/pyim-smzmdict"
+ :repo "con5tella/pyim-smzmdict"
  :files (:defaults "*.pyim"))
diff --git a/recipes/readable b/recipes/readable
new file mode 100644
index 00000000000..013202307c0
--- /dev/null
+++ b/recipes/readable
@@ -0,0 +1 @@
+(readable :fetcher github :repo "akirak/readable.el")
diff --git a/recipes/reverso b/recipes/reverso
new file mode 100644
index 00000000000..b55903a585c
--- /dev/null
+++ b/recipes/reverso
@@ -0,0 +1 @@
+(reverso :repo "SqrtMinusOne/reverso.el" :fetcher github)
diff --git a/recipes/riben b/recipes/riben
new file mode 100644
index 00000000000..4a06377f359
--- /dev/null
+++ b/recipes/riben
@@ -0,0 +1,2 @@
+(riben :fetcher github :repo "akirak/emacs-dumb-japanese"
+       :files (:defaults (:exclude "avy-riben.el")))
diff --git a/recipes/rom-party b/recipes/rom-party
index 29d4c268554..8b496fda6b2 100644
--- a/recipes/rom-party
+++ b/recipes/rom-party
@@ -1 +1,4 @@
-(rom-party :repo "LaurenceWarne/rom-party.el" :fetcher github)
+(rom-party
+ :repo "LaurenceWarne/rom-party.el"
+ :fetcher github
+ :files (:defaults "index.extmap.gz"))
diff --git a/recipes/source-peek b/recipes/source-peek
new file mode 100644
index 00000000000..cc0ef656cfb
--- /dev/null
+++ b/recipes/source-peek
@@ -0,0 +1 @@
+(source-peek :fetcher github :repo "iqbalansari/emacs-source-peek")
\ No newline at end of file
diff --git a/recipes/tbx2org b/recipes/tbx2org
index 9b9ba31047c..53fb956deac 100644
--- a/recipes/tbx2org
+++ b/recipes/tbx2org
@@ -1,2 +1 @@
-(tbx2org :repo "istib/tbx2org" :fetcher github)
-
+(tbx2org :repo "emacsattic/tbx2org" :fetcher github)
diff --git a/recipes/tsort b/recipes/tsort
index 8926ac0f9b0..0da6c06cfa8 100644
--- a/recipes/tsort
+++ b/recipes/tsort
@@ -1 +1 @@
-(tsort :repo "ehawkvu/tsort.el" :fetcher github)
+(tsort :repo "echawk/tsort.el" :fetcher github)
diff --git a/recipes/turbo-log b/recipes/turbo-log
new file mode 100644
index 00000000000..7e0a0e1e8d2
--- /dev/null
+++ b/recipes/turbo-log
@@ -0,0 +1 @@
+(turbo-log :fetcher github :repo "Artawower/turbo-log")
\ No newline at end of file
diff --git a/recipes/twist b/recipes/twist
new file mode 100644
index 00000000000..c861486dbd4
--- /dev/null
+++ b/recipes/twist
@@ -0,0 +1 @@
+(twist :fetcher github :repo "emacs-twist/twist.el")
\ No newline at end of file
diff --git a/recipes/use-package-dash-docs b/recipes/use-package-dash-docs
new file mode 100644
index 00000000000..e219600c662
--- /dev/null
+++ b/recipes/use-package-dash-docs
@@ -0,0 +1,3 @@
+(use-package-dash-docs :repo "dash-docs-el/dash-docs"
+                       :fetcher github
+                       :files ("use-package-dash-docs.el"))
diff --git a/recipes/vundo b/recipes/vundo
new file mode 100644
index 00000000000..8174c3c8878
--- /dev/null
+++ b/recipes/vundo
@@ -0,0 +1 @@
+(vundo :fetcher github :repo "casouri/vundo")
\ No newline at end of file
diff --git a/recipes/workbox b/recipes/workbox
new file mode 100644
index 00000000000..b5a87ab29b8
--- /dev/null
+++ b/recipes/workbox
@@ -0,0 +1 @@
+(workbox :fetcher github :repo "akirak/workbox.el")