diff --git a/core/modules/commands/rendertiddlers.js b/core/modules/commands/rendertiddlers.js
index d02d98417..782459e44 100644
--- a/core/modules/commands/rendertiddlers.js
+++ b/core/modules/commands/rendertiddlers.js
@@ -35,7 +35,8 @@ Command.prototype.execute = function() {
 		wiki = this.commander.wiki,
 		filter = this.params[0],
 		template = this.params[1],
-		pathname = path.resolve(this.commander.outputPath,this.params[2]),
+		outputPath = this.commander.outputPath,
+		pathname = path.resolve(outputPath,this.params[2]),		
 		type = this.params[3] || "text/html",
 		extension = this.params[4] || ".html",
 		deleteDirectory = (this.params[5] || "") != "noclean",
@@ -50,7 +51,13 @@ Command.prototype.execute = function() {
 		var container = $tw.fakeDocument.createElement("div");
 		widgetNode.render(container,null);
 		var text = type === "text/html" ? container.innerHTML : container.textContent;
-		fs.writeFileSync(path.resolve(pathname,encodeURIComponent(title) + extension),text,"utf8");
+		var export_path = null;
+		if($tw.utils.hop($tw.macros,"tv-get-export-path")) {
+			export_path = path.resolve(outputPath,$tw.macros["tv-get-export-path"].run.apply(self,[title]) + extension);
+		}
+		var final_path = export_path || path.resolve(pathname,encodeURIComponent(title) + extension);
+		$tw.utils.createFileDirectories(final_path);
+		fs.writeFileSync(final_path,text,"utf8");
 	});
 	return null;
 };
diff --git a/core/modules/widgets/image.js b/core/modules/widgets/image.js
index afa8b447b..50c0703b1 100644
--- a/core/modules/widgets/image.js
+++ b/core/modules/widgets/image.js
@@ -52,7 +52,7 @@ ImageWidget.prototype.render = function(parent,nextSibling) {
 		tiddler = this.wiki.getTiddler(this.imageSource);
 	if(!tiddler) {
 		// The source isn't the title of a tiddler, so we'll assume it's a URL
-		src = this.imageSource;
+		src = this.getVariable("tv-get-export-image-link",{params: [{name: "src",value: this.imageSource}],defaultValue: this.imageSource});
 	} else {
 		// Check if it is an image tiddler
 		if(this.wiki.isImageTiddler(this.imageSource)) {
diff --git a/core/modules/widgets/link.js b/core/modules/widgets/link.js
index ff7209ec4..ebb3b413c 100755
--- a/core/modules/widgets/link.js
+++ b/core/modules/widgets/link.js
@@ -77,6 +77,7 @@ LinkWidget.prototype.renderLink = function(parent,nextSibling) {
 		wikiLinkTemplate = wikiLinkTemplateMacro ? wikiLinkTemplateMacro.trim() : "#$uri_encoded$",
 		wikiLinkText = wikiLinkTemplate.replace("$uri_encoded$",encodeURIComponent(this.to));
 	wikiLinkText = wikiLinkText.replace("$uri_doubleencoded$",encodeURIComponent(encodeURIComponent(this.to)));
+	wikiLinkText = this.getVariable("tv-get-export-link",{params: [{name: "to",value: this.to}],defaultValue: wikiLinkText});
 	domNode.setAttribute("href",wikiLinkText);
 	// Set the tooltip
 	// HACK: Performance issues with re-parsing the tooltip prevent us defaulting the tooltip to "<$transclude field='tooltip'><$transclude field='title'/></$transclude>"