diff --git a/3.1/modules/max_size/helpers/max_size_event.php b/3.1/modules/max_size/helpers/max_size_event.php
new file mode 100644
index 00000000..2fd1d1c5
--- /dev/null
+++ b/3.1/modules/max_size/helpers/max_size_event.php
@@ -0,0 +1,37 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2010 Bharat Mediratta
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+class max_size_event_Core {
+  static function item_before_create($item) {
+    $max_size = module::get_var("max_size", "max_size", 600);
+    if ($item->is_photo()) {
+      list ($width, $height, $mime_type) = photo::get_file_metadata($item->data_file);
+      if ($width > $max_size || $height > $max_size) {
+        $tempnam = tempnam(TMPPATH, "size");
+        $tmpfile = $tempnam . "." . pathinfo($item->data_file, PATHINFO_EXTENSION);
+        gallery_graphics::resize(
+          $item->data_file, $tmpfile,
+          array("width" => $max_size, "height" => $max_size, "master" => Image::AUTO));
+        rename($tmpfile, $item->data_file);
+        unlink($tempnam);
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/3.1/modules/max_size/helpers/max_size_installer.php b/3.1/modules/max_size/helpers/max_size_installer.php
new file mode 100644
index 00000000..bd268b9c
--- /dev/null
+++ b/3.1/modules/max_size/helpers/max_size_installer.php
@@ -0,0 +1,25 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2010 Bharat Mediratta
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+class max_size_installer {
+  static function install() {
+    module::set_var("max_size", "max_size", 1024);
+    module::set_version("max_size", 1);
+  }
+}
diff --git a/3.1/modules/max_size/module.info b/3.1/modules/max_size/module.info
new file mode 100644
index 00000000..e7646bea
--- /dev/null
+++ b/3.1/modules/max_size/module.info
@@ -0,0 +1,3 @@
+name = "Max Size"
+description = "Automatically scale down the original image if it's too large."
+version = 1