diff --git a/gitso/trunk/Gitso.py b/gitso/trunk/Gitso.py
index ee7061b..06ec1fc 100644
--- a/gitso/trunk/Gitso.py
+++ b/gitso/trunk/Gitso.py
@@ -319,7 +319,7 @@ class AboutWindow(wx.Frame):
 		wx.Frame.__init__(self, parent, wx.ID_ANY, title, size=(525,400), style=wx.CLOSE_BOX | wx.MINIMIZE_BOX)
 		
 		# Create a read-only box
-		if sys.platform == "linux":
+		if sys.platform.find('linux') != -1:
 			license = open(os.path.join(sys.path[0], '..', 'share', 'doc', 'gitso', 'copyright'), 'r')
 		else:
 			license = open('copyright', 'r')
@@ -374,6 +374,7 @@ elif sys.platform == "win32":
 else:
 	prefFile = os.path.join(os.path.expanduser("~"), ".gitso-hosts")
 
-app = wx.PySimpleApp()
-Connect(None, -1, "Gitso")
-app.MainLoop()
+if __name__ == "__main__":
+	app = wx.PySimpleApp()
+	Connect(None, -1, "Gitso")
+	app.MainLoop()
diff --git a/gitso/trunk/arch/linux/gitso b/gitso/trunk/arch/linux/gitso
index f99787d..b9b0503 100644
--- a/gitso/trunk/arch/linux/gitso
+++ b/gitso/trunk/arch/linux/gitso
@@ -1,10 +1,11 @@
 #!/usr/bin/env python
 
-import sys, os
+import sys, os, wx
 sys.path.append(os.path.join(sys.path[0], '..', 'share', 'gitso'))
 
-from gitso import Connect
+from Gitso import Connect
 
 if __name__ == "__main__":
-	hello = Connect()
-	hello.main()
+	app = wx.PySimpleApp()
+	Connect(None, -1, "Gitso")
+	app.MainLoop()
diff --git a/gitso/trunk/makegitso b/gitso/trunk/makegitso
index 53a90fe..c7603bd 100755
--- a/gitso/trunk/makegitso
+++ b/gitso/trunk/makegitso
@@ -62,6 +62,7 @@ if(`uname -a` =~ m/Darwin/) {
 	`mkdir $path/usr/share/doc/gitso`;
 	`mkdir $path/usr/share/gitso`;
 	`cp arch/linux/gitso $path/usr/bin/`;
+	`chmod u+x $path/usr/bin`;
 	`cp Gitso.py $path/usr/share/gitso/`;
 	`cp __init__.py $path/usr/share/gitso/`;
 	`cp hosts.txt $path/usr/share/gitso/`;