diff --git a/README.md b/README.md
index b17db2f..404f322 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # Emacs X Window Manager
 
 EXWM (Emacs X Window Manager) is a full-featured tiling X window manager
-for Emacs built on top of [XELB](https://github.com/ch11ng/xelb).
+for Emacs built on top of [XELB](https://github.com/emacs-exwm/xelb).
 It features:
 + Fully keyboard-driven operations
 + Hybrid layout modes (tiling & stacking)
@@ -13,9 +13,9 @@ It features:
 + (Optional) Background setting support
 
 Please check out the
-[screenshots](https://github.com/ch11ng/exwm/wiki/Screenshots)
-to get an overview of what EXWM is capable of,
-and the [user guide](https://github.com/ch11ng/exwm/wiki)
+[screenshots](https://github.com/emacs-exwm/exwm/wiki/Screenshots)
+to get an overview of what EXWM is capable of, and the
+[user guide](https://github.com/emacs-exwm/exwm/wiki)
 for a detailed explanation of its usage.
 
 **Note**: If you install EXWM from source, it's recommended to install
diff --git a/exwm.el b/exwm.el
index 3561cf2..d421a22 100644
--- a/exwm.el
+++ b/exwm.el
@@ -7,7 +7,7 @@
 ;; Version: 0.28
 ;; Package-Requires: ((emacs "26.1") (xelb "0.18"))
 ;; Keywords: unix
-;; URL: https://github.com/ch11ng/exwm
+;; URL: https://github.com/emacs-exwm/exwm
 
 ;; This file is part of GNU Emacs.
 
@@ -29,7 +29,7 @@
 ;; Overview
 ;; --------
 ;; EXWM (Emacs X Window Manager) is a full-featured tiling X window manager
-;; for Emacs built on top of [XELB](https://github.com/ch11ng/xelb).
+;; for Emacs built on top of [XELB](https://github.com/emacs-exwm/xelb).
 ;; It features:
 ;; + Fully keyboard-driven operations
 ;; + Hybrid layout modes (tiling & stacking)
@@ -56,7 +56,7 @@
 ;;    xinit -- vt01
 ;;
 ;; You should additionally hide the menu-bar, tool-bar, etc to increase the
-;; usable space.  Please check the wiki (https://github.com/ch11ng/exwm/wiki)
+;; usable space.  Please check the wiki (https://github.com/emacs-exwm/exwm/wiki)
 ;; for more detailed instructions on installation, configuration, usage, etc.
 
 ;; References: