diff --git a/build_num b/build_num
index 2a389ad58..03eea8ca5 100644
--- a/build_num
+++ b/build_num
@@ -1 +1 @@
-#define BUILD_NUM 2257
+#define BUILD_NUM 2258
diff --git a/src/cisco_lib/CompilerDriver_pix_run.cpp b/src/cisco_lib/CompilerDriver_pix_run.cpp
index f90d6b716..bf0455a14 100644
--- a/src/cisco_lib/CompilerDriver_pix_run.cpp
+++ b/src/cisco_lib/CompilerDriver_pix_run.cpp
@@ -139,6 +139,8 @@ QString CompilerDriver_pix::assembleFwScript(Cluster *cluster,
     top_comment.setVariable("generate_outb_acls", QString((generate_outb_acls)?"yes":"no"));
     top_comment.setVariable("afpa", QString((afpa)?"yes":"no"));
 
+    script_skeleton.setVariable("short_script", options->getBool("short_script"));
+    script_skeleton.setVariable("not_short_script", ! options->getBool("short_script"));
     script_skeleton.setVariable("system_configuration_script", system_configuration_script.c_str());
     script_skeleton.setVariable("policy_script", policy_script.c_str());
     script_skeleton.setVariable("nat_script", nat_script.c_str());
diff --git a/src/gui/pixAdvancedDialog.cpp b/src/gui/pixAdvancedDialog.cpp
index 288d1bef7..9dafb9ead 100644
--- a/src/gui/pixAdvancedDialog.cpp
+++ b/src/gui/pixAdvancedDialog.cpp
@@ -173,6 +173,8 @@ pixAdvancedDialog::pixAdvancedDialog(QWidget*, FWObject *o)//(parent)
     FWOptions *fwoptions = (Firewall::cast(obj))->getOptionsObject();
     assert(fwoptions!=NULL);
 
+/* Page Script */
+
     bool f1=fwoptions->getBool("pix_acl_basic");
     bool f2=fwoptions->getBool("pix_acl_no_clear");
     bool f3=fwoptions->getBool("pix_acl_substitution");
@@ -194,6 +196,8 @@ pixAdvancedDialog::pixAdvancedDialog(QWidget*, FWObject *o)//(parent)
     Management *mgmt=(Firewall::cast(obj))->getManagementObject();
     assert(mgmt!=NULL);
 
+    data.registerOption( m_dialog->short_script, fwoptions, "short_script");
+
 /* Page "Compiler Options" */
 
     bool outboundACLSupported= (Resources::platform_res[platform]->getResourceBool(
diff --git a/src/res/configlets/pix_os/script_skeleton b/src/res/configlets/pix_os/script_skeleton
index a8ac97218..e4b7eb857 100644
--- a/src/res/configlets/pix_os/script_skeleton
+++ b/src/res/configlets/pix_os/script_skeleton
@@ -25,7 +25,15 @@
 ! End of prolog script:
 !
 
+{{if short_script}}
+! This script was generated with option "Generate only access-list, access-group,
+! nat, static, global" commands turned on in the "Script" tab of the firewall
+! object advanced settings dialog. Skipping system configuration commands.
+{{endif}}
+
+{{if not_short_script}}
 {{$system_configuration_script}}
+{{endif}}
 
 {{$policy_script}}