diff --git a/aegisub/changelog.txt b/aegisub/changelog.txt
index cba5d8cac..bb02eb610 100644
--- a/aegisub/changelog.txt
+++ b/aegisub/changelog.txt
@@ -112,6 +112,7 @@ Please visit http://aegisub.net to download latest version
 - Added "Video Formats" to "Open Audio"'s file selector, so you can open audio directly from video files (regardless of whether they're loaded or not). This has always worked, but it was never explicit. (AMZ)
 - Instead of falling back to your local charset, Aegisub will now use the "universalchardet" library (the one used by the Mozilla project) to autodetect the character set of non-Unicode files. (AMZ)
 - Added option to disable automatic grabbing of times from selected lines on the audio display. Also, it will never pick the times from 0:00:00.00 -> 0:00:00.00 lines. (AMZ)
+- Added a "Scale Border and Shadow" check box to script properties dialog. (AMZ)
 
 
 = 1.10 beta - 2006.08.07 ===========================
diff --git a/aegisub/dialog_properties.cpp b/aegisub/dialog_properties.cpp
index 1f792e0f7..622e5fc49 100644
--- a/aegisub/dialog_properties.cpp
+++ b/aegisub/dialog_properties.cpp
@@ -106,7 +106,7 @@ DialogProperties::DialogProperties (wxWindow *parent)
 
 	// Options
 	wxSizer *optionsBox = new wxStaticBoxSizer(wxHORIZONTAL,this,_("Options"));
-	wxFlexGridSizer *optionsGrid = new wxFlexGridSizer(2,2,5,5);
+	wxFlexGridSizer *optionsGrid = new wxFlexGridSizer(3,2,5,5);
 	wxArrayString options;
 	options.Add(_("0: Smart wrapping, top line is wider"));
 	options.Add(_("1: End-of-line word wrapping, only \\N breaks"));
@@ -127,6 +127,11 @@ DialogProperties::DialogProperties (wxWindow *parent)
 	else collision->SetSelection(0);
 	optionsGrid->Add(new wxStaticText(this,-1,_("Collision: ")),0,wxALIGN_CENTER_VERTICAL,0);
 	optionsGrid->Add(collision,1,wxEXPAND,0);
+	ScaleBorder = new wxCheckBox(this,-1,_("Scale Border and Shadow"));
+	ScaleBorder->SetToolTip(_("Scale border and shadow together with script/render resolution. If this is unchecked, relative border and shadow size will depend on renderer."));
+	ScaleBorder->SetValue(subs->GetScriptInfoAsInt(_T("ScaledBorderAndShadow")) == 1);
+	optionsGrid->AddSpacer(0);
+	optionsGrid->Add(ScaleBorder,1,wxEXPAND,0);
 	optionsGrid->AddGrowableCol(1,1);
 	optionsBox->Add(optionsGrid,1,wxEXPAND,0);
 
@@ -183,6 +188,7 @@ void DialogProperties::OnOK(wxCommandEvent &event) {
 	count += SetInfoIfDifferent(_T("WrapStyle"),wxString::Format(_T("%i"),WrapStyle->GetSelection()));
 	wxString col[2] = { _T("Normal"), _T("Reverse")};
 	count += SetInfoIfDifferent(_T("Collisions"),col[collision->GetSelection()]);
+	count += SetInfoIfDifferent(_T("ScaledBorderAndShadow"),ScaleBorder->GetValue()?_T("1"):_T("0"));
 
 	if (count) AssFile::top->FlagAsModified(_("property changes"));
 
diff --git a/aegisub/dialog_properties.h b/aegisub/dialog_properties.h
index d6c4ee893..7c468215c 100644
--- a/aegisub/dialog_properties.h
+++ b/aegisub/dialog_properties.h
@@ -59,6 +59,7 @@ private:
 	wxComboBox *collision;
 	wxTextCtrl *ResX;
 	wxTextCtrl *ResY;
+	wxCheckBox *ScaleBorder;
 
 	wxString ResXValue;
 	wxString ResYValue;