diff --git a/CHANGELOG b/CHANGELOG
index 03969a5..f909b63 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,7 @@
 
     - Improve checks of number of incoming streams limit and associated
       error reporting.
+    - [BUGFIX] Command-line option `-6` now works correctly.
 
 2018-05-16
 
diff --git a/test/http_client.c b/test/http_client.c
index 1cbae58..d04e450 100644
--- a/test/http_client.c
+++ b/test/http_client.c
@@ -460,10 +460,8 @@ main (int argc, char **argv)
     {
         switch (opt) {
         case '4':
-            prog.prog_ipver = 4;
-            break;
         case '6':
-            prog.prog_ipver = 4;
+            prog.prog_ipver = opt - '0';
             break;
         case 'I':
             client_ctx.hcc_flags |= HCC_ABORT_ON_INCOMPLETE;