diff --git a/editor/extensions/ext-php_savefile.js b/editor/extensions/ext-php_savefile.js
new file mode 100644
index 00000000..30512610
--- /dev/null
+++ b/editor/extensions/ext-php_savefile.js
@@ -0,0 +1,24 @@
+/*globals $, svgCanvas, svgEditor*/
+/*jslint regexp:true*/
+svgEditor.addExtension("php_savefile", {
+	callback: function() {
+		'use strict';
+		function getFileNameFromTitle () {
+			var title = svgCanvas.getDocumentTitle();
+			return $.trim(title); // .replace(/[^a-z0-9\.\_\-]+/gi, '_'); // We could do this more stringent client-side filtering, but we need to do on the server anyways
+		}
+		var save_svg_action = 'extensions/savefile.php';
+		svgEditor.setCustomHandlers({
+			save: function(win, data) {
+				var svg = "<?xml version=\"1.0\"?>\n" + data,
+					filename = getFileNameFromTitle();
+
+				$.post(save_svg_action, {output_svg: svg, filename: filename});
+			}
+		});
+	}
+});
+
+this.saveHandler = function(svg) {'use strict';
+	$.post("svg-editor-save.php", {svg_data: svg});
+};
diff --git a/editor/extensions/savefile.php b/editor/extensions/savefile.php
new file mode 100644
index 00000000..2bf5909b
--- /dev/null
+++ b/editor/extensions/savefile.php
@@ -0,0 +1,17 @@
+<?php
+	// You must first create a file "savefile_config.php" in this extensions directory and do whatever
+	//   checking of user credentials, etc. that you wish; otherwise anyone will be able to post SVG
+	//   files to your server which may cause disk space or possibly security problems
+  require('savefile_config.php');
+  if (!isset($_POST['output_svg'])) {
+		print "You must supply output_svg";
+		exit;
+	}
+	$svg = $_POST['output_svg'];
+	$filename = (isset($_POST['filename']) && !empty($_POST['filename']) ? preg_replace('@[\\\\/:*?"<>|]@', '_', urldecode($_POST['filename'])) : 'saved') . '.svg'; // These characters are indicated as prohibited by Windows
+	$output_svg = urldecode($svg);
+	$file = $filename;
+	$fh = fopen($file, 'w') or die("Can't open file");
+	fwrite($fh, $output_svg);
+	fclose($fh);
+?>
diff --git a/extras/server-save/README.txt b/extras/server-save/README.txt
deleted file mode 100644
index e94370bf..00000000
--- a/extras/server-save/README.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Usage:
-
-1) copy file svg-editor-save.php into the directory
-
-2) edit the end of the svgcanvas.js and change this.saveHandler method
-   into the method described in svg-editor-save.js
-
-3) now the drawings will be saved into the file named saved.svg
diff --git a/extras/server-save/svg-editor-save.js b/extras/server-save/svg-editor-save.js
deleted file mode 100644
index 2564d75b..00000000
--- a/extras/server-save/svg-editor-save.js
+++ /dev/null
@@ -1,4 +0,0 @@
-/*globals $*/
-this.saveHandler = function(svg) {'use strict';
-	$.post("svg-editor-save.php", {svg_data: svg});
-};
diff --git a/extras/server-save/svg-editor-save.php b/extras/server-save/svg-editor-save.php
deleted file mode 100644
index ee488c9c..00000000
--- a/extras/server-save/svg-editor-save.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-	$svg = $_REQUEST['svg_data'];
-	$svg_data = urldecode($svg);
-	$file = 'saved.svg';
-	$fh = fopen($file, 'w') or die("Can't open file");
-	fwrite($fh, $svg_data);
-	fclose($fh);
-?>