diff --git a/boot.php b/boot.php
index 7e71a38d9e..9715f9cfdb 100644
--- a/boot.php
+++ b/boot.php
@@ -3,6 +3,7 @@
 set_time_limit(0);
 
 define ( 'BUILD_ID',               1031   );
+define ( 'FRIENDIKA_VERSION',      '2.01.1000' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.0'  );
 
 define ( 'EOL',                    "<br />\r\n"     );
@@ -311,7 +312,8 @@ 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
 		));
 	}
 
diff --git a/include/items.php b/include/items.php
index 47bc9f15a9..d2104c3955 100644
--- a/include/items.php
+++ b/include/items.php
@@ -182,6 +182,7 @@ function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0)
 
 
 	$atom .= replace_macros($feed_template, array(
+		'$version'      => xmlify(FRIENDIKA_VERSION),
 		'$feed_id'      => xmlify($a->get_baseurl() . '/profile/' . $owner_nick),
 		'$feed_title'   => xmlify($owner['name']),
 		'$feed_updated' => xmlify(datetime_convert('UTC', 'UTC', 'now' , ATOM_TIME)) ,
diff --git a/include/notifier.php b/include/notifier.php
index 5bc21cf13c..7791b9bd4b 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -176,6 +176,7 @@
 	}
 
 	$atom .= replace_macros($feed_template, array(
+			'$version'      => xmlify(FRIENDIKA_VERSION),
 			'$feed_id'      => xmlify($a->get_baseurl() . '/profile/' . $owner['nickname'] ),
 			'$feed_title'   => xmlify($owner['name']),
 			'$feed_updated' => xmlify(datetime_convert('UTC', 'UTC', $updated . '+00:00' , ATOM_TIME)) ,
diff --git a/view/atom_feed.tpl b/view/atom_feed.tpl
index 3b2df2f676..e59b20ab1c 100644
--- a/view/atom_feed.tpl
+++ b/view/atom_feed.tpl
@@ -10,7 +10,7 @@
 
   <id>$feed_id</id>
   <title>$feed_title</title>
-  <generator uri="http://friendika.com" version="2.0">Friendika</generator>
+  <generator uri="http://friendika.com" version="$version">Friendika</generator>
   <link rel="license" href="http://creativecommons.org/licenses/by/3.0/" />
   $hub
   $salmon
diff --git a/view/en/head.tpl b/view/en/head.tpl
index 50dd9cab6b..04dd39bdbb 100644
--- a/view/en/head.tpl
+++ b/view/en/head.tpl
@@ -1,5 +1,6 @@
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <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/ff-32.jpg">