diff --git a/Command/Upgrade.hs b/Command/Upgrade.hs
index 3c9fa3eebf..94398c70a1 100644
--- a/Command/Upgrade.hs
+++ b/Command/Upgrade.hs
@@ -8,15 +8,18 @@
 module Command.Upgrade where
 
 import Command
+import Upgrade
+import Version
 
 command :: [Command]
-command = [Command "upgrade" paramNothing seek "upgrade repository layout"]
+command = [standaloneCommand "upgrade" paramNothing seek
+	"upgrade repository layout"]
 
 seek :: [CommandSeek]
 seek = [withNothing start]
 
 start :: CommandStartNothing
 start = do
-	-- The actual upgrading is handled by just running any command,
-	-- so nothing extra needs to be done.
-	return $ Just $ return $ Just $ return True
+	r <- upgrade
+	checkVersion
+	return $ Just $ return $ Just $ return r