diff --git a/I3_VERSION b/I3_VERSION
index 7cf2ba0d..9f75f91d 100644
--- a/I3_VERSION
+++ b/I3_VERSION
@@ -1 +1 @@
-4.18-non-git
+4.18.1 (2020-04-22)
diff --git a/Makefile.am b/Makefile.am
index 59eba84a..d62b2f53 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -118,7 +118,7 @@ EXTRA_DIST = \
 	I3_VERSION \
 	LICENSE \
 	PACKAGE-MAINTAINER \
-	RELEASE-NOTES-4.18 \
+	RELEASE-NOTES-4.18.1 \
 	generate-command-parser.pl \
 	parser-specs/commands.spec \
 	parser-specs/config.spec \
diff --git a/RELEASE-NOTES-4.18 b/RELEASE-NOTES-4.18
deleted file mode 100644
index 4396ee1b..00000000
--- a/RELEASE-NOTES-4.18
+++ /dev/null
@@ -1,71 +0,0 @@
-
- ┌────────────────────────────┐
- │ Release notes for i3 v4.18 │
- └────────────────────────────┘
-
-This is i3 v4.18. This version is considered stable. All users of i3 are
-strongly encouraged to upgrade.
-
- ┌────────────────────────────┐
- │ Changes in i3 v4.18        │
- └────────────────────────────┘
-
-  • docs/ipc: document fullscreen_mode in GET_TREE reply
-  • docs/ipc: document marks field in GET_TREE reply
-  • docs/ipc: document window_type in GET_TREE reply
-  • docs/ipc: improve documentation for window_properties
-  • docs/userguide: clarify commands/config directive wording
-  • layout saving: remanage window after property updates (e.g. titles)
-  • get_first_output: prefer primary output (e.g. when moving disabled outputs)
-  • ipc: add window_type to nodes
-  • ipc: add container id to nodes
-  • allow dragging active titles for all container types (e.g. floating+tabbed)
-  • allow dragging inactive titles after a 10px threshold
-  • make tray icon order deterministic (sorted by class/instance)
-  • implement focus next|prev
-  • implement focus next|prev sibling
-  • implement focus_wrapping workspace
-  • exit with exit code 0 on --help
-  • exec command: respect command criteria
-
- ┌────────────────────────────┐
- │ Bugfixes                   │
- └────────────────────────────┘
-
-  • build: fix lcov support
-  • build: use AC_REPLACE_FUNCS, drop bundled memmem
-  • build: fix building with -fno-common (for gcc 10)
-  • build: configure: deal with git worktree checkouts, where .git is a file
-  • docs/userguide: fix link to pango markup
-  • docs/userguide: add missing manipulating_layout anchor
-  • docs/userguide: fix IPC socket location
-  • i3-nagbar: make debug log visible
-  • i3-nagbar: fix small memory leaks
-  • i3bar: fix small memory leaks
-  • move workspace to output: don’t create duplicate numbered workspace
-  • correctly select output when pointer query fails
-  • fix moving windows to scratchpad when using marks
-  • fix startup workspace selection when workspace command uses options
-  • do not try to center floating window on itself (fixes xterm placement)
-  • fix “move window to <mark>” when target is a workspace
-  • correctly activate windows behind a fullscreen window
-  • fix back-and-forth after renaming workspaces
-  • keep focus when moving container to marked workspace
-  • do not show scratchpad windows upon move to position command
-  • reparent windows to their current position when unmanaging
-    (fixes dock clients unexpectedly moving to different output)
-  • fix crash when moving containers
-  • scratchpad_move: un-fullscreen correct container
-  • avoid crash when nc->window is NULL
-
- ┌────────────────────────────┐
- │ Thanks!                    │
- └────────────────────────────┘
-
-Thanks for testing, bugfixes, discussions and everything I forgot go out to:
-
-  acheronfail, Albert Safin, Antoine, Benjamin Dopplinger, Brian Ashworth,
-  Damien Cassou, Daniele Varrazzo, David Shen, Erwin J. van Eijk, Ingo Bürk,
-  Iskustvo, izzel, Konst Mayer, Orestis Floros, Yury Ignatev
-
--- Michael Stapelberg, 2020-02-17
diff --git a/RELEASE-NOTES-4.18.1 b/RELEASE-NOTES-4.18.1
new file mode 100644
index 00000000..c05180f8
--- /dev/null
+++ b/RELEASE-NOTES-4.18.1
@@ -0,0 +1,32 @@
+
+ ┌──────────────────────────────┐
+ │ Release notes for i3 v4.18.1 │
+ └──────────────────────────────┘
+
+This is i3 v4.18.1. This version is considered stable. All users of i3 are
+strongly encouraged to upgrade.
+
+This is a bugfix release for v4.18.
+
+ ┌────────────────────────────┐
+ │ Bugfixes                   │
+ └────────────────────────────┘
+
+  • Move parent nodes in scratchpad correctly
+  • i3bar: Call cont_child() more liberally
+  • Fix load_layout crash when floating node doesn't have CT_FLOATING_CON parent
+  • Fix SEGFAULT when i3bar receives invalid input
+  • Revert "floating_reposition: avoid extra tree_render"
+  • Call tree_render if floating move changes workspace
+  • Update EWMH properties on workspace move
+  • cmd_focus_sibling: Fix crash on workspace level
+
+ ┌────────────────────────────┐
+ │ Thanks!                    │
+ └────────────────────────────┘
+
+Thanks for testing, bugfixes, discussions and everything I forgot go out to:
+
+  Heman Gandhi, Orestis Floros
+
+-- Michael Stapelberg, 2020-04-22
diff --git a/configure.ac b/configure.ac
index dda93482..fe34d6b2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Run autoreconf -fi to generate a configure script from this file.
 
 AC_PREREQ([2.69])
-AC_INIT([i3], [4.18], [https://github.com/i3/i3/issues])
+AC_INIT([i3], [4.18.1], [https://github.com/i3/i3/issues])
 # For AX_EXTEND_SRCDIR
 AX_ENABLE_BUILDDIR
 AM_INIT_AUTOMAKE([foreign subdir-objects -Wall no-dist-gzip dist-bzip2])