diff --git a/contrib/handle_svg/main.php b/contrib/handle_svg/main.php
new file mode 100644
index 00000000..3dc1de01
--- /dev/null
+++ b/contrib/handle_svg/main.php
@@ -0,0 +1,118 @@
+<?php
+/**
+ * Name: SVG File Handler
+ * Author: Shish <webmaster@shishnet.org>
+ * Description: Handle SVG files
+ */
+
+class SVGFileHandler extends Extension {
+	var $theme;
+
+	public function receive_event($event) {
+		if(is_null($this->theme)) $this->theme = get_theme_object("handle_svg", "SVGFileHandlerTheme");
+
+		if(is_a($event, 'DataUploadEvent') && $this->supported_ext($event->type) && $this->check_contents($event->tmpname)) {
+			$hash = $event->hash;
+			$ha = substr($hash, 0, 2);
+			if(!move_upload_to_archive($event)) return;
+			send_event(new ThumbnailGenerationEvent($event->hash, $event->type));
+			$image = $this->create_image_from_data("images/$ha/$hash", $event->metadata);
+			if(is_null($image)) {
+				$event->veto("SVG Handler failed to create image object from data");
+				return;
+			}
+			send_event(new ImageAdditionEvent($event->user, $image));
+		}
+
+		if(is_a($event, 'ThumbnailGenerationEvent') && $this->supported_ext($event->type)) {
+			$hash = $event->hash;
+			$ha = substr($hash, 0, 2);
+
+			global $config;
+
+//			if($config->get_string("thumb_engine") == "convert") {
+//				$w = $config->get_int("thumb_width");
+//				$h = $config->get_int("thumb_height");
+//				$q = $config->get_int("thumb_quality");
+//				$mem = $config->get_int("thumb_max_memory") / 1024 / 1024; // IM takes memory in MB
+//
+//				exec("convert images/{$ha}/{$hash}[0] -geometry {$w}x{$h} -quality {$q} jpg:thumbs/{$ha}/{$hash}");
+//			}
+//			else {
+				// FIXME: scale image, as not all boards use 192x192
+				copy("ext/handle_svg/thumb.jpg", "thumbs/$ha/$hash");
+//			}
+		}
+
+		if(is_a($event, 'DisplayingImageEvent') && $this->supported_ext($event->image->ext)) {
+			$this->theme->display_image($event->page, $event->image);
+		}
+		
+		if(is_a($event, 'PageRequestEvent') && ($event->page_name == "get_svg")) {
+			global $database;
+			$id = int_escape($event->get_arg(0));
+			$image = $database->get_image($id);
+			$hash = $image->hash;
+			$ha = substr($hash, 0, 2);
+			
+			$event->page->set_type("image/svg+xml");
+			$event->page->set_mode("data");
+			$event->page->set_data(file_get_contents("images/$ha/$hash"));
+		}
+	}
+
+	private function supported_ext($ext) {
+		$exts = array("svg");
+		return array_contains($exts, strtolower($ext));
+	}
+
+	private function create_image_from_data($filename, $metadata) {
+		global $config;
+
+		$image = new Image();
+
+		$msp = new MiniSVGParser($filename);
+		$image->width = $msp->width;
+		$image->height = $msp->height;
+		
+		$image->filesize  = $metadata['size'];
+		$image->hash      = $metadata['hash'];
+		$image->filename  = $metadata['filename'];
+		$image->ext       = $metadata['extension'];
+		$image->tag_array = tag_explode($metadata['tags']);
+		$image->source    = $metadata['source'];
+
+		return $image;
+	}
+
+	private function check_contents($file) {
+		if(!file_exists($file)) return false;
+		
+		$msp = new MiniSVGParser($file);
+		return $msp->valid;
+	}
+}
+
+class MiniSVGParser {
+	var $valid=false, $width=0, $height=0;
+
+	function MiniSVGParser($file) {
+		$xml_parser = xml_parser_create();
+		xml_set_element_handler($xml_parser, array($this, "startElement"), array($this, "endElement"));
+		$this->valid = xml_parse($xml_parser, file_get_contents($file), true);
+		xml_parser_free($xml_parser);
+	}
+
+	function startElement($parser, $name, $attrs) {
+		if($name == "SVG") {
+			$this->width = int_escape($attrs["WIDTH"]);
+			$this->height = int_escape($attrs["HEIGHT"]);
+		}
+	}
+
+	function endElement($parser, $name) {
+	}
+}
+
+add_event_listener(new SVGFileHandler());
+?>
diff --git a/contrib/handle_svg/theme.php b/contrib/handle_svg/theme.php
new file mode 100644
index 00000000..86186537
--- /dev/null
+++ b/contrib/handle_svg/theme.php
@@ -0,0 +1,15 @@
+<?php
+
+class SVGFileHandlerTheme extends Themelet {
+	public function display_image($page, $image) {
+		$ilink = make_link("get_svg/{$image->id}/{$image->id}.svg");
+//		$ilink = $image->get_image_link();
+		$html = "
+			<object data='$ilink' type='image/svg+xml' width='{$image->width}' height='{$image->height}'>
+			    <embed src='$ilink' type='image/svg+xml' width='{$image->width}' height='{$image->height}' />
+			</object>
+		";
+		$page->add_block(new Block("Image", $html, "main", 0));
+	}
+}
+?>
diff --git a/contrib/handle_svg/thumb.jpg b/contrib/handle_svg/thumb.jpg
new file mode 100644
index 00000000..d89117b5
Binary files /dev/null and b/contrib/handle_svg/thumb.jpg differ