diff --git a/Makefile b/Makefile
index f3373b61..12df12be 100644
--- a/Makefile
+++ b/Makefile
@@ -33,10 +33,10 @@ dryrun: probert i18n
 	$(MAKE) ui-view DRYRUN="--dry-run --uefi"
 
 ui-view:
-	(bin/$(PYTHONSRC)-tui $(DRYRUN) $(MACHARGS))
+	$(PYTHON) -m subiquity $(DRYRUN) $(MACHARGS)
 
 ui-view-serial:
-	(TERM=att4424 bin/$(PYTHONSRC)-tui $(DRYRUN) --serial)
+	(TERM=att4424 $(PYTHON) -m subiquity $(DRYRUN) --serial)
 
 lint: flake8
 
diff --git a/subiquity/__main__.py b/subiquity/__main__.py
new file mode 100644
index 00000000..9ada9ef3
--- /dev/null
+++ b/subiquity/__main__.py
@@ -0,0 +1,5 @@
+import sys
+
+if __name__ == '__main__':
+    from subiquity.cmd.tui import main
+    sys.exit(main())