diff --git a/app/src/gambas3/.src/Project/FMakeExecutable.class b/app/src/gambas3/.src/Project/FMakeExecutable.class
index 3b1ffb96c..9e4fc4ba6 100644
--- a/app/src/gambas3/.src/Project/FMakeExecutable.class
+++ b/app/src/gambas3/.src/Project/FMakeExecutable.class
@@ -25,6 +25,13 @@ Public Sub Form_Open()
   chkIncVersion.Value = Not Project.Config["/Executable/DoNotIncrementVersion", False]
   chkIncVersion.Visible = Not Project.VersionFile
 
+  Dim sVers As String[] = Split(Project.FormatVersion(), ".")
+    txtMajor.Value = sVers[0]
+    txtMinor.Value = sVers[1]
+    Try txtRelease.Value = sVers[2]
+
+  If Not chkIncVersion.Value And If chkIncVersion.Visible Then pnlVersion.Visible = True
+
   chkNoTest.Visible = Project.HasTest()
   chkNoTest.Value = Project.Config["/Executable/NoTestModule", False]
 
@@ -68,3 +75,19 @@ Public Sub btnCancel_Click()
 
 End
 
+
+Public Sub grpVersion_Change()
+
+   With Project
+     .MajorVersion = txtMajor.Value 
+     .MinorVersion = txtMinor.Value
+     .ReleaseVersion = txtRelease.Value
+   End With
+  
+End
+
+Public Sub chkIncVersion_Click()
+
+  pnlVersion.Visible = Not Last.Value
+
+End
diff --git a/app/src/gambas3/.src/Project/FMakeExecutable.form b/app/src/gambas3/.src/Project/FMakeExecutable.form
index 0b8ae061b..dea79bd2a 100644
--- a/app/src/gambas3/.src/Project/FMakeExecutable.form
+++ b/app/src/gambas3/.src/Project/FMakeExecutable.form
@@ -25,9 +25,42 @@
     { VBox1 VBox
       MoveScaled(1,1,87,50)
       Margin = True
-      { chkIncVersion CheckBox
-        MoveScaled(1,1,19,4)
-        Text = ("Increment version")
+      { hbVersion HBox
+        MoveScaled(1,1,85,4)
+        Spacing = True
+        { chkIncVersion CheckBox
+          MoveScaled(0,0,19,4)
+          AutoResize = True
+          Text = ("Increment version")
+        }
+        { Spring2 Spring
+          MoveScaled(30,2,4,1)
+        }
+        { pnlVersion HBox
+          MoveScaled(35,0,49,4)
+          Visible = False
+          Spacing = True
+          { Label2 Label
+            MoveScaled(3,0,9,4)
+            AutoResize = True
+            Text = ("Version")
+          }
+          { txtMajor SpinBox grpVersion
+            Name = "txtMajor"
+            MoveScaled(14,0,9,4)
+            MaxValue = 9999
+          }
+          { txtMinor SpinBox grpVersion
+            Name = "txtMinor"
+            MoveScaled(24,0,9,4)
+            MaxValue = 9999
+          }
+          { txtRelease SpinBox grpVersion
+            Name = "txtRelease"
+            MoveScaled(35,0,12,4)
+            MaxValue = 999999
+          }
+        }
       }
       { chkDebug CheckBox
         MoveScaled(1,5,39,4)
@@ -78,15 +111,15 @@
     MoveScaled(6,62,79,4)
     Spacing = True
     { Spring1 Spring
-      MoveScaled(16,2,9,1)
+      MoveScaled(7,2,9,1)
     }
     { btnOK Button
-      MoveScaled(35,0,16,4)
+      MoveScaled(40,0,16,4)
       Text = ("OK")
       Default = True
     }
     { btnCancel Button
-      MoveScaled(54,0,16,4)
+      MoveScaled(59,0,16,4)
       Text = ("Cancel")
       Cancel = True
     }