diff --git a/boot.php b/boot.php
index 2b9b209b..ab1505d7 100644
--- a/boot.php
+++ b/boot.php
@@ -380,7 +380,7 @@ class App {
 		$this->page['title'] = $this->config['sitename'];
 		$tpl = load_view_file('view/head.tpl');
 		$this->page['htmlhead'] = replace_macros($tpl,array(
-			'$baseurl' => $this->get_baseurl() . '/',
+			'$baseurl' => $this->get_baseurl(),
 			'$generator' => 'Friendika' . ' ' . FRIENDIKA_VERSION,
 			'$delitem' => t('Delete this item?'),
 			'$comment' => t('Comment')
diff --git a/view/head.tpl b/view/head.tpl
index 1ff0ae1d..ff66997e 100644
--- a/view/head.tpl
+++ b/view/head.tpl
@@ -1,5 +1,5 @@
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-<base href="$baseurl" />
+<base href="$baseurl/" />
 <meta name="generator" content="$generator" />
 <link rel="stylesheet" type="text/css" href="$stylesheet" media="all" />
 <link rel="shortcut icon" href="$baseurl/images/friendika-32.png" />