diff --git a/docs/generators/go-gin-server.md b/docs/generators/go-gin-server.md
index ab53b8910ec..4e26377ec19 100644
--- a/docs/generators/go-gin-server.md
+++ b/docs/generators/go-gin-server.md
@@ -5,9 +5,11 @@ sidebar_label: go-gin-server
 
 | Option | Description | Values | Default |
 | ------ | ----------- | ------ | ------- |
+|apiPath|Name of the folder that contains the Go source code| |go|
 |hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |true|
 |packageName|Go package name (convention: lowercase).| |openapi|
 |packageVersion|Go package version.| |1.0.0|
+|serverPort|The network port the generated server binds to| |8080|
 
 ## IMPORT MAPPING
 
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GoGinServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GoGinServerCodegen.java
index 376ee21635b..404d1c06a01 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GoGinServerCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GoGinServerCodegen.java
@@ -16,6 +16,7 @@
 
 package org.openapitools.codegen.languages;
 
+import org.openapitools.codegen.CliOption;
 import org.openapitools.codegen.CodegenConstants;
 import org.openapitools.codegen.CodegenOperation;
 import org.openapitools.codegen.CodegenType;
@@ -107,6 +108,14 @@ public class GoGinServerCodegen extends AbstractGoCodegen {
                         "continue", "for", "import", "return", "var", "error", "nil")
                 // Added "error" as it's used so frequently that it may as well be a keyword
         );
+
+        cliOptions.add(new CliOption("apiPath", "Name of the folder that contains the Go source code")
+                .defaultValue(apiPath));
+
+        CliOption optServerPort = new CliOption("serverPort", "The network port the generated server binds to");
+        optServerPort.setType("int");
+        optServerPort.defaultValue(Integer.toString(serverPort));
+        cliOptions.add(optServerPort);
     }
 
     @Override