diff --git a/include/items.php b/include/items.php
index f57f3a833b..87e680e324 100644
--- a/include/items.php
+++ b/include/items.php
@@ -176,7 +176,7 @@ function get_atom_elements($item) {
 	if($rawcreated)
 		$res['created'] = unxmlify($rawcreated[0]['data']);
 
-	$rawlocation = $item->get_item_tags('http://activitystrea.ms/spec/1.0/', 'place');
+	$rawlocation = $item->get_item_tags(NAMESPACE_DFRN, 'location');
 	if($rawlocation)
 		$res['location'] = unxmlify($rawlocation[0]['data']);
 
diff --git a/view/atom_item.tpl b/view/atom_item.tpl
index 99b18e05f7..1dae06db56 100644
--- a/view/atom_item.tpl
+++ b/view/atom_item.tpl
@@ -15,6 +15,6 @@
 		<published>$published</published>
 		<updated>$updated</updated>
 		<content>$content</content>
-		<as:place>$location</as:place>
+		<dfrn:location>$location</dfrn:location>
 		<dfrn:comment-allow>$comment_allow</dfrn:comment-allow>
 	</entry>