diff --git a/fpm.toml b/fpm.toml
index 1f2811688a..568754c510 100644
--- a/fpm.toml
+++ b/fpm.toml
@@ -12,7 +12,7 @@ rev = "2f5eaba864ff630ba0c3791126a3f811b6e437f3"
 
 [dependencies.M_CLI2]
 git = "https://github.com/urbanjost/M_CLI2.git"
-rev = "1f3b922ce35f105d1a51869bed9a1013b5b552b6"
+rev = "ea6bbffc1c2fb0885e994d37ccf0029c99b19f24"
 
 [[test]]
 name = "cli-test"
diff --git a/src/fpm_environment.f90 b/src/fpm_environment.f90
index ef0177f783..a3c073fc31 100644
--- a/src/fpm_environment.f90
+++ b/src/fpm_environment.f90
@@ -217,6 +217,8 @@ function get_command_arguments_quoted() result(args)
                 elseif(ilength.gt.0)then
                     if(index(arg//' ','-').ne.1)then
                         args=args//quote//arg//quote//' '
+                    elseif(index(arg,' ').ne.0)then
+                        args=args//quote//arg//quote//' '
                     else
                         args=args//arg//' '
                     endif
diff --git a/test/cli_test/cli_test.f90 b/test/cli_test/cli_test.f90
index d979f1a71f..e23afde2bf 100644
--- a/test/cli_test/cli_test.f90
+++ b/test/cli_test/cli_test.f90
@@ -53,7 +53,7 @@ program main
 'CMD="run proj1 p2 project3 --profile debug",                      NAME="proj1","p2","project3",profile="debug",', &
 'CMD="run proj1 p2 project3 --profile release",                    NAME="proj1","p2","project3",profile="release",', &
 'CMD="run proj1 p2 project3 --profile release -- arg1 -x ""and a long one""", &
-   &NAME="proj1","p2","project3",profile="release",ARGS="""arg1"" -x ""and a long one""",                         ', &
+   &NAME="proj1","p2","project3",profile="release",ARGS="""arg1"" ""-x"" ""and a long one""",                         ', &
 
 'CMD="test",                                                                                              ', &
 'CMD="test my_project",                                            NAME="my_project",                     ', &
@@ -61,7 +61,7 @@ program main
 'CMD="test proj1 p2 project3 --profile debug",                     NAME="proj1","p2","project3",profile="debug",', &
 'CMD="test proj1 p2 project3 --profile release",                   NAME="proj1","p2","project3",profile="release",', &
 'CMD="test proj1 p2 project3 --profile release -- arg1 -x ""and a long one""", &
-   &NAME="proj1","p2","project3",profile="release" ARGS="""arg1"" -x ""and a long one""",                         ', &
+   &NAME="proj1","p2","project3",profile="release" ARGS="""arg1"" ""-x"" ""and a long one""",                         ', &
 
 'CMD="build",                                                      NAME= profile="",ARGS="",', &
 'CMD="build --profile release",                                            NAME= profile="release",ARGS="",', &