diff --git a/worldmap-save.c b/worldmap-save.c
index 36ee94311..e867846f5 100644
--- a/worldmap-save.c
+++ b/worldmap-save.c
@@ -122,9 +122,9 @@ void insert_css(struct membuffer *b)
 
 void insert_javascript(struct membuffer *b)
 {
-	put_string(b, "<script type=\"text/javascript\"src=\"");
+	put_string(b, "<script type=\"text/javascript\" src=\"");
 	put_string(b, getGoogleApi());
-	put_string(b, "&sensor=false\">\n</script>\n<script type=\"text/javascript\">\nvar map;\n");
+	put_string(b, "&amp;sensor=false\">\n</script>\n<script type=\"text/javascript\">\nvar map;\n");
 	put_format(b, "function initialize() {\nvar mapOptions = {\n\t%s,", map_options);
 	put_string(b, "rotateControl: false,\n\tstreetViewControl: false,\n\tmapTypeControl: false\n};\n");
 	put_string(b, "map = new google.maps.Map(document.getElementById(\"map-canvas\"),mapOptions);\nvar markers = new Array();");
@@ -139,7 +139,7 @@ void export(struct membuffer *b)
 	insert_html_header(b);
 	insert_css(b);
 	insert_javascript(b);
-	put_string(b, "\t</head>\n<body>\n<div id=\"map-canvas\"/>\n</body>\n</html>");
+	put_string(b, "\t</head>\n<body>\n<div id=\"map-canvas\"></div>\n</body>\n</html>");
 }
 
 void export_worldmap_HTML(const char *file_name)
