diff --git a/inkscape_driver/eggbot.inx b/inkscape_driver/eggbot.inx
index ab7328b..b7c9434 100755
--- a/inkscape_driver/eggbot.inx
+++ b/inkscape_driver/eggbot.inx
@@ -113,8 +113,6 @@ Grey-Green-Yellow-Pink, for both motors
 Known issues:
 * "Cancel" function does not work while plotting.
  (This is due to a known bug in Inkscape.) 
-
-* Align mode (pen up, motors off) not yet implemented.
             </_param>
         </page>
     </param>
diff --git a/inkscape_driver/eggbot.py b/inkscape_driver/eggbot.py
index 40a642d..68faf26 100755
--- a/inkscape_driver/eggbot.py
+++ b/inkscape_driver/eggbot.py
@@ -382,6 +382,11 @@ class EggBot( inkex.Effect ):
 			self.ServoSetupWrapper()
 			self.penUp()
 
+		elif self.options.manualType == "align-mode":
+			self.ServoSetupWrapper()
+			self.penUp()
+			self.sendDisableMotors()
+
 		elif self.options.manualType == "lower-pen":
 			self.ServoSetupWrapper()
 			self.penDown()