diff --git a/core/changelog.txt b/core/changelog.txt
index 796edd137..f573ac708 100644
--- a/core/changelog.txt
+++ b/core/changelog.txt
@@ -30,6 +30,7 @@ Please visit http://aegisub.net to download latest version
 - Fixed bug related to tag cycling, which would reset grid, move video and force a refresh of everything (slow, and could undo uncommited changes) (AMZ)
 - Fixed some bugs related to inserting overrides via the buttons over the edit box (AMZ)
 - Implemented Redo (AMZ)
+- Fonts collector will now default collection to same folder as script (Set to "?script" on config.dat) (AMZ)
 
 
 = 1.09 beta - 2006.01.16 ===========================
diff --git a/core/fonts_collector.cpp b/core/fonts_collector.cpp
index 4b59511b4..a81167735 100644
--- a/core/fonts_collector.cpp
+++ b/core/fonts_collector.cpp
@@ -56,7 +56,12 @@ DialogFontsCollector::DialogFontsCollector(wxWindow *parent)
 : wxDialog(parent,-1,_("Fonts Collector"),wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE)
 {
 	// Destination box
-	DestBox = new wxTextCtrl(this,-1,Options.AsText(_T("Fonts Collector Destination")),wxDefaultPosition,wxSize(250,20),0);
+	wxString dest = Options.AsText(_T("Fonts Collector Destination"));
+	if (dest == _T("?script")) {
+		wxFileName filename(AssFile::top->filename);
+		dest = filename.GetPath();
+	}
+	DestBox = new wxTextCtrl(this,-1,dest,wxDefaultPosition,wxSize(250,20),0);
 	BrowseButton = new wxButton(this,BROWSE_BUTTON,_("&Browse..."));
 	wxSizer *DestBottomSizer = new wxBoxSizer(wxHORIZONTAL);
 	wxStaticText *DestLabel = new wxStaticText(this,-1,_("Choose the folder where the fonts will be collected to.\nIt will be created if it doesn't exist."));
@@ -153,7 +158,12 @@ void DialogFontsCollector::OnStart(wxCommandEvent &event) {
 		worker->Run();
 
 		// Set options
-		Options.SetText(_T("Fonts Collector Destination"),foldername);
+		wxString dest = foldername;
+		wxFileName filename(AssFile::top->filename);
+		if (filename.GetPath() == dest) {
+			dest = _T("?script");
+		}
+		Options.SetText(_T("Fonts Collector Destination"),dest);
 		Options.Save();
 
 		// Set buttons
diff --git a/core/options.cpp b/core/options.cpp
index dbf295fa1..caf9ff284 100644
--- a/core/options.cpp
+++ b/core/options.cpp
@@ -118,7 +118,7 @@ void OptionsManager::LoadDefaults() {
 
 	SetBool(_T("Highlight subs in frame"),true);
 
-	SetText(_T("Fonts Collector Destination"),AegisubApp::folderName + _T("fonts"));
+	SetText(_T("Fonts Collector Destination"),_T("?script"));
 
 	SetBool(_T("Threaded Video"),false);
 	SetInt(_T("Avisynth MemoryMax"),64);
diff --git a/docs/feature comparison.xls b/docs/feature comparison.xls
index dda40d369..7358af049 100644
Binary files a/docs/feature comparison.xls and b/docs/feature comparison.xls differ