diff --git a/aegisub/dialog_options.cpp b/aegisub/dialog_options.cpp
index 317f8c774..9987b44c3 100644
--- a/aegisub/dialog_options.cpp
+++ b/aegisub/dialog_options.cpp
@@ -111,7 +111,9 @@ DialogOptions::DialogOptions(wxWindow *parent)
 
 		AddCheckBox(generalPage,genSizer4,_("Show Splash Screen"),_T("Show splash"));
 		AddCheckBox(generalPage,genSizer4,_("Show Tip of the Day"),_T("Tips enabled"));
+#ifdef __WXMSW__
 		AddCheckBox(generalPage,genSizer4,_("Auto Check for Updates"),_T("Auto check for updates"));
+#endif
 		AddCheckBox(generalPage,genSizer4,_("Save config.dat locally"),_T("Local config"));
 		genSizer4->AddGrowableCol(0,1);
 
diff --git a/aegisub/frame_main.cpp b/aegisub/frame_main.cpp
index 3bad2217d..3191440bc 100644
--- a/aegisub/frame_main.cpp
+++ b/aegisub/frame_main.cpp
@@ -172,6 +172,8 @@ FrameMain::FrameMain (wxArrayString args)
 	LoadList(args);
 
 	// Version checker
+	// Fails on non-Windows platforms with a crash
+#ifdef __WXMSW__
 	int option = Options.AsInt(_T("Auto check for updates"));
 	if (option == -1) {
 		int result = wxMessageBox(_("Do you want Aegisub to check for updates whenever it starts? You can still do it manually via the Help menu."),_("Check for updates?"),wxYES_NO);
@@ -184,6 +186,7 @@ FrameMain::FrameMain (wxArrayString args)
 		DialogVersionCheck *checker = new DialogVersionCheck (this,true);
 		(void)checker;
 	}
+#endif
 
 	//ShowFullScreen(true,wxFULLSCREEN_NOBORDER | wxFULLSCREEN_NOCAPTION);
 }
@@ -504,8 +507,12 @@ void FrameMain::InitMenu() {
 	AppendBitmapMenuItem(helpMenu,Menu_Help_Forums, _("&Forums..."), _("Visit Aegisub's forums"),wxBITMAP(forums_button));
 	AppendBitmapMenuItem(helpMenu,Menu_Help_BugTracker, _("&Bug Tracker..."), _("Visit Aegisub's bug tracker to report bugs and request new features"),wxBITMAP(bugtracker_button));
 	AppendBitmapMenuItem (helpMenu,Menu_Help_IRCChannel, _("&IRC Channel..."), _("Visit Aegisub's official IRC channel"), wxBITMAP(irc_button));
+#ifndef __WXMAC__
 	helpMenu->AppendSeparator();
+#endif
+#ifdef __WXMSW__
 	AppendBitmapMenuItem(helpMenu,Menu_Help_Check_Updates, _("&Check for Updates..."), _("Check to see if there is a new version of Aegisub available"),wxBITMAP(blank_button));
+#endif
 	AppendBitmapMenuItem(helpMenu,Menu_Help_About, _("&About..."), _("About Aegisub"),wxBITMAP(about_button));
 	MenuBar->Append(helpMenu, _("&Help"));