diff --git a/include/class.pdf.php b/include/class.pdf.php
index 537fb5fe139ea94fe136d3f48c19470f36ae388b..dae066b5b04ef22f151a65ce54cb71059d6691ac 100644
--- a/include/class.pdf.php
+++ b/include/class.pdf.php
@@ -30,8 +30,9 @@ class Ticket2PDF extends FPDF
     var $ticket = null;
 
 	function Ticket2PDF($ticket, $notes=false) {
+        global $thisstaff;
 
-        parent::FPDF();
+        parent::FPDF('P', 'mm', $thisstaff->getDefaultPaperSize());
 
         $this->ticket = $ticket;
 
diff --git a/include/class.staff.php b/include/class.staff.php
index bd7379ed95e659fbf0c2c527735376f831238e89..2f5726d012d3e6f59e7b23faee48a54023766960 100644
--- a/include/class.staff.php
+++ b/include/class.staff.php
@@ -159,6 +159,10 @@ class Staff {
         return $this->ht['default_signature_type'];
     }
 
+    function getDefaultPaperSize() {
+        return $this->ht['default_paper_size'];
+    }
+
     function forcePasswdChange() {
         return ($this->ht['change_passwd']);
     }
@@ -388,7 +392,8 @@ class Staff {
             .' ,show_assigned_tickets='.db_input(isset($vars['show_assigned_tickets'])?1:0)
             .' ,max_page_size='.db_input($vars['max_page_size'])
             .' ,auto_refresh_rate='.db_input($vars['auto_refresh_rate'])
-            .' ,default_signature_type='.db_input($vars['default_signature_type']);
+            .' ,default_signature_type='.db_input($vars['default_signature_type'])
+            .' ,default_paper_size='.db_input($vars['default_paper_size']);
 
 
         if($vars['passwd1'])
diff --git a/include/staff/profile.inc.php b/include/staff/profile.inc.php
index e2b883e1b465b7c939b0bc713b27f6ec03dcd325..39eaf80a54e0aa53611239b0fdccacfbfb38ceeb 100644
--- a/include/staff/profile.inc.php
+++ b/include/staff/profile.inc.php
@@ -156,6 +156,23 @@ $info['id']=$staff->getId();
                 &nbsp;<span class="error">&nbsp;<?php echo $errors['default_signature_type']; ?></span>
             </td>
         </tr>
+        <tr>
+            <td width="180">Default Paper Size:</td>
+            <td>
+                <select name="default_paper_size">
+                  <option value="none" selected="selected">&mdash; None &mdash;</option>
+                  <?php
+                  $options=array('Letter', 'Legal', 'A4', 'A3');
+                  foreach($options as $v) {
+                      echo sprintf('<option value="%s" %s>%s</option>',
+                                $v,($info['default_paper_size']==$v)?'selected="selected"':'',$v);
+                  }
+                  ?>
+                </select>
+                <em>Paper size used when printing tickets to PDF</em>
+                &nbsp;<span class="error">&nbsp;<?php echo $errors['default_paper_size']; ?></span>
+            </td>
+        </tr>
         <?php
         //Show an option to show assigned tickets to admins & managers.
         if($staff->isAdmin() || $staff->isManager()){ ?>
diff --git a/main.inc.php b/main.inc.php
index 57769d32c5fc1d55a6b6d4857aa48cc5da8587fb..8421be6ceb15b8f7323eca7aac4b437298aea7a4 100644
--- a/main.inc.php
+++ b/main.inc.php
@@ -55,7 +55,7 @@
 
     #Current version && schema signature (Changes from version to version)
     define('THIS_VERSION','1.7-DPR3'); //Shown on admin panel
-    define('SCHEMA_SIGNATURE','c2d2fabfdf15e1632f00850ffb361558'); //MD5 signature of the db schema. (used to trigger upgrades)
+    define('SCHEMA_SIGNATURE','aa4664afc3b43d4068eb2e82684fc28e'); //MD5 signature of the db schema. (used to trigger upgrades)
 
     #load config info
     $configfile='';
diff --git a/setup/inc/sql/c2d2fabf-aa4664af.patch.sql b/setup/inc/sql/c2d2fabf-aa4664af.patch.sql
new file mode 100644
index 0000000000000000000000000000000000000000..5b5cce6a306a45e14f83e065f195cf45c228757d
--- /dev/null
+++ b/setup/inc/sql/c2d2fabf-aa4664af.patch.sql
@@ -0,0 +1,13 @@
+/**
+ * Add column for default paper size when printing tickets from the system
+ * 
+ * @version 1.7-rc1 default-paper-size
+ */
+
+ALTER TABLE %TABLE_PREFIX%staff ADD
+    `default_paper_size` ENUM( 'Letter', 'Legal', 'Ledger', 'A4', 'A3' ) NOT NULL DEFAULT 'Letter'
+    AFTER `default_signature_type`;
+
+-- Finished with patch
+UPDATE `%TABLE_PREFIX%config`
+    SET `schema_signature`='aa4664afc3b43d4068eb2e82684fc28e';
diff --git a/setup/inc/sql/osticket-v1.7-mysql.sql b/setup/inc/sql/osticket-v1.7-mysql.sql
index a3d03dd7218066d54ee3b900fba1fad9129add9a..b8bb7ce263dfbcb7442fda8b2e15b9edebdbb48c 100644
--- a/setup/inc/sql/osticket-v1.7-mysql.sql
+++ b/setup/inc/sql/osticket-v1.7-mysql.sql
@@ -478,6 +478,7 @@ CREATE TABLE `%TABLE_PREFIX%staff` (
   `max_page_size` int(11) unsigned NOT NULL default '0',
   `auto_refresh_rate` int(10) unsigned NOT NULL default '0',
   `default_signature_type` ENUM( 'none', 'mine', 'dept' ) NOT NULL DEFAULT 'none',
+  `default_paper_size` ENUM( 'Letter', 'Legal', 'Ledger', 'A4', 'A3' ) NOT NULL DEFAULT 'Letter',
   `created` datetime NOT NULL,
   `lastlogin` datetime default NULL,
   `passwdreset` datetime default NULL,
diff --git a/setup/inc/sql/osticket-v1.7-mysql.sql.md5 b/setup/inc/sql/osticket-v1.7-mysql.sql.md5
index 798a76acc57bcf65d56d7c11af8cda14317aefea..4bdfcd1ce270c2ca67c9c9f461bef15d010936f6 100644
--- a/setup/inc/sql/osticket-v1.7-mysql.sql.md5
+++ b/setup/inc/sql/osticket-v1.7-mysql.sql.md5
@@ -1 +1 @@
-c2d2fabfdf15e1632f00850ffb361558
+aa4664afc3b43d4068eb2e82684fc28e