diff --git a/README b/README
index 6ddb2efb5..30061c243 100644
--- a/README
+++ b/README
@@ -1441,6 +1441,8 @@ ydididodat (https://github.com/ydididodat)
 yumkam (https://github.com/yumkam)
 	- add compile-time option to restrict --net= to root only
 	- man page fixes
+Yurei TZK (https://github.com/yureitzk)
+	- added --xephyr-extra-params= command
 Yves-Alexis Perez (https://github.com/corsac-s)
 	- signal-desktop profile fix
 	- signal: add access to D-Bus freedesktop.org secret API
diff --git a/contrib/syntax/lists/profile_commands_arg1.list b/contrib/syntax/lists/profile_commands_arg1.list
index c9808b9a5..c3daf6b73 100644
--- a/contrib/syntax/lists/profile_commands_arg1.list
+++ b/contrib/syntax/lists/profile_commands_arg1.list
@@ -83,5 +83,5 @@ warn
 whitelist
 whitelist-ro
 x11
-xephyr-screen
 xephyr-extra-params
+xephyr-screen
diff --git a/src/firejail/usage.c b/src/firejail/usage.c
index 9c16a2e17..c51de5e85 100644
--- a/src/firejail/usage.c
+++ b/src/firejail/usage.c
@@ -301,8 +301,9 @@ static const char *const usage_str =
 	"    --x11=xorg - enable X11 security extension.\n"
 	"    --x11=xpra - enable Xpra X11 server.\n"
 	"    --x11=xvfb - enable Xvfb X11 server.\n"
+	"    --xephyr-extra-params=OPTIONS - set Xephyr server command extra parameters\n"
+	"\tfor --x11=xephyr.\n"
 	"    --xephyr-screen=WIDTHxHEIGHT - set screen size for --x11=xephyr.\n"
-	"    --xephyr-extra-params=OPTIONS - set Xephyr server command extra parameters for --x11=xephyr.\n"
 #endif
 	"\n"
 	"Examples:\n"
diff --git a/src/man/firejail-profile.5.in b/src/man/firejail-profile.5.in
index 7dcd99f10..38108a2b3 100644
--- a/src/man/firejail-profile.5.in
+++ b/src/man/firejail-profile.5.in
@@ -675,6 +675,19 @@ Enable X11 sandboxing with Xpra server.
 \fBx11 xvfb
 Enable X11 sandboxing with Xvfb server.
 .TP
+\fBxephyr-extra-params OPTIONS
+Set Xephyr server command extra parameters for x11 xephyr. This command should be included in the profile file before x11 xephyr command.
+.br
+
+.br
+Example:
+.br
+
+.br
+xephyr-extra-params -grayscale
+.br
+x11 xephyr
+.TP
 \fBxephyr-screen WIDTHxHEIGHT
 Set screen size for x11 xephyr. This command should be included in the profile file before x11 xephyr command.
 .br
@@ -688,19 +701,6 @@ xephyr-screen 640x480
 .br
 x11 xephyr
 
-.TP
-\fBxephyr-extra-params OPTIONS
-Set Xephyr server command extra parameters for x11 xephyr. This command should be included in the profile file before x11 xephyr command.
-.br
-
-.br
-Example:
-.br
-
-.br
-xephyr-extra-params -grayscale
-.br
-x11 xephyr
 #endif
 #ifdef HAVE_DBUSPROXY
 .SH DBus filtering
diff --git a/src/man/firejail.1.in b/src/man/firejail.1.in
index 206e90202..36bf1d867 100644
--- a/src/man/firejail.1.in
+++ b/src/man/firejail.1.in
@@ -3456,6 +3456,18 @@ On the client machine we start a VNC viewer and use it to connect to our server:
 $ vncviewer
 .br
 
+.TP
+\fB\-\-xephyr-extra-params=OPTIONS
+Set Xephyr server command extra parameters for x11 --x11=xephyr. The setting will overwrite the default set in /etc/firejail/firejail.config
+for the current sandbox. Run Xephyr -help to get a list of available options.
+.br
+
+.br
+Example:
+.br
+$ firejail --net=eth0 --x11=xephyr --xephyr-extra-params="-title firefox" firefox
+.br
+
 .TP
 \fB\-\-xephyr-screen=WIDTHxHEIGHT
 Set screen size for --x11=xephyr. The setting will overwrite the default set in /etc/firejail/firejail.config
@@ -3468,17 +3480,6 @@ Example:
 $ firejail --net=eth0 --x11=xephyr --xephyr-screen=640x480 /usr/bin/firefox
 .br
 
-.TP
-\fB\-\-xephyr-extra-params=OPTIONS
-Set Xephyr server command extra parameters for x11 --x11=xephyr. The setting will overwrite the default set in /etc/firejail/firejail.config
-for the current sandbox. Run Xephyr -help to get a list of available options.
-.br
-
-.br
-Example:
-.br
-$ firejail --net=eth0 --x11=xephyr --xephyr-extra-params="-title firefox" firefox
-.br
 #endif
 .\" Note: Keep this in sync with invalid_name() in src/firejail/util.c.
 #ifdef HAVE_APPARMOR
diff --git a/src/zsh_completion/_firejail.in b/src/zsh_completion/_firejail.in
index 4fa330a74..5dde853ac 100644
--- a/src/zsh_completion/_firejail.in
+++ b/src/zsh_completion/_firejail.in
@@ -270,8 +270,8 @@ _firejail_args=(
 #ifdef HAVE_X11
     '--x11[enable X11 sandboxing. The software checks first if Xpra is installed, then it checks if Xephyr is installed. If all fails, it will attempt to use X11 security extension]'
     '--x11=-[disable or enable specific X11 server]: :(none xephyr xorg xpra xvfb)'
-    '--xephyr-screen=-[set screen size for --x11=xephyr]: :(WIDTHxHEIGHT)'
     '--xephyr-extra-params=-[set Xephyr command server extra parameters for --x11=xephyr]: :(OPTIONS)'
+    '--xephyr-screen=-[set screen size for --x11=xephyr]: :(WIDTHxHEIGHT)'
 #endif
 )