diff --git a/openstreetmap.tgz b/openstreetmap.tgz
new file mode 100644
index 000000000..85da07487
Binary files /dev/null and b/openstreetmap.tgz differ
diff --git a/openstreetmap/openstreetmap.php b/openstreetmap/openstreetmap.php
new file mode 100755
index 000000000..d76414c44
--- /dev/null
+++ b/openstreetmap/openstreetmap.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Name: Open Street Map
+ * Description: Use openstreetmap.org for displaying locations.
+ * Version: 1.0
+ * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
+ * 
+ *
+ */
+
+
+function openstreetmap_install() {
+
+	register_hook('render_location', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_location');
+
+	logger("installed openstreetmap");
+}
+
+
+function openstreetmap_uninstall() {
+
+	unregister_hook('render_location', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_location');
+
+	logger("removed openstreetmap");
+}
+
+
+
+function openstreetmap_location($a, &$item) {
+
+	$location = '';
+	$coord = '';
+
+	$location = (($item['location']) ? '<a target="map" title="' . $item['location'] . '" href="http://www.openstreetmap.org/?q=' . urlencode($item['location']) . '">' . $item['location'] . '</a>' : '');
+
+	if($item['coord']) {
+		$coords = explode(' ', $item['coord']);
+		if(count($coords) > 1) {
+			$coord = '<a target="map" title="' . $item['coord'] . '" href="http://www.openstreetmap.org/?lat=' . urlencode($coords[0]) . '&lon=' . urlencode($coords[1]) . '&zoom=10">' . $item['coord'] . '</a>' ;
+		}
+	}
+	if(strlen($coord)) {
+		if($location)
+			$location .= '<br /><span class="smalltext">(' . $coord . ')</span>';
+		else
+			$location = '<span class="smalltext">' . $coord . '</span>';
+	}
+	$item['html'] = $location;
+	return;
+}
+
diff --git a/randplace.tgz b/randplace.tgz
index 937c02d5e..98b28a9dc 100755
Binary files a/randplace.tgz and b/randplace.tgz differ
diff --git a/randplace/randplace.php b/randplace/randplace.php
index 35503850f..df713766c 100755
--- a/randplace/randplace.php
+++ b/randplace/randplace.php
@@ -136,7 +136,8 @@ function randplace_post_hook($a, &$item) {
 function randplace_settings_post($a,$post) {
 	if(! local_user())
 		return;
-	set_pconfig(local_user(),'randplace','enable',intval($_POST['randplace']));
+	if($_POST['randplace-submit'])
+		set_pconfig(local_user(),'randplace','enable',intval($_POST['randplace']));
 }
 
 
@@ -175,6 +176,6 @@ function randplace_settings(&$a,&$s) {
 
 	/* provide a submit button */
 
-	$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="submit" class="settings-submit" value="' . t('Submit') . '" /></div></div>';
+	$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="randplace-submit" class="settings-submit" value="' . t('Submit') . '" /></div></div>';
 
 }