diff --git a/gui/griffon-app/models/com/muwire/gui/wizard/WizardModel.groovy b/gui/griffon-app/models/com/muwire/gui/wizard/WizardModel.groovy
index a5f64c98..5110ea10 100644
--- a/gui/griffon-app/models/com/muwire/gui/wizard/WizardModel.groovy
+++ b/gui/griffon-app/models/com/muwire/gui/wizard/WizardModel.groovy
@@ -17,7 +17,8 @@ class WizardModel {
     def finished
     
     final List<WizardStep> steps = [new NicknameStep(),
-                                    new DirectoriesStep()]
+                                    new DirectoriesStep(),
+                                    new LastStep(embeddedRouterAvailable)]
     int currentStep
     
     @Observable boolean finishButtonEnabled
diff --git a/gui/src/main/groovy/com/muwire/gui/wizard/LastStep.groovy b/gui/src/main/groovy/com/muwire/gui/wizard/LastStep.groovy
new file mode 100644
index 00000000..11ac1b1c
--- /dev/null
+++ b/gui/src/main/groovy/com/muwire/gui/wizard/LastStep.groovy
@@ -0,0 +1,31 @@
+package com.muwire.gui.wizard
+
+import com.muwire.core.MuWireSettings
+
+class LastStep extends WizardStep {
+    
+    private final boolean embeddedRouterAvailable
+
+    public LastStep(boolean embeddedRouterAvailable) {
+        super("last")
+        this.embeddedRouterAvailable = embeddedRouterAvailable
+    }
+
+    @Override
+    protected void buildUI(FactoryBuilderSupport builder) {
+        builder.panel(constraints: getConstraint()) {
+            label("The wizard is complete.  Press \"Finish\" to launch MuWire.")
+            if (embeddedRouterAvailable)
+                label("MuWire will launch an embedded I2P router.  This can take a few minutes.")
+        }
+    }
+
+    @Override
+    protected List<String> validate() {
+        return null
+    }
+
+    @Override
+    protected void apply(MuWireSettings muSettings, Properties i2pSettings) {
+    }
+}