diff --git a/README.md b/README.md
index 3266dbda30..c506f58afb 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# GNU social 1.3.x
+# GNU social 1.19.x
 (c) 2010 Free Software Foundation, Inc
 
 This is the README file for GNU social, the free
diff --git a/lib/framework.php b/lib/framework.php
index 8f6f3c9d54..1614e23352 100644
--- a/lib/framework.php
+++ b/lib/framework.php
@@ -22,8 +22,8 @@ if (!defined('GNUSOCIAL')) { exit(1); }
 define('GNUSOCIAL_ENGINE', 'GNU social');
 define('GNUSOCIAL_ENGINE_URL', 'https://www.gnu.org/software/social/');
 
-define('GNUSOCIAL_BASE_VERSION', '1.3.0');
-define('GNUSOCIAL_LIFECYCLE', 'beta5'); // 'dev', 'alpha[0-9]+', 'beta[0-9]+', 'rc[0-9]+', 'release'
+define('GNUSOCIAL_BASE_VERSION', '1.19.0');
+define('GNUSOCIAL_LIFECYCLE', 'rc0'); // 'dev', 'alpha[0-9]+', 'beta[0-9]+', 'rc[0-9]+', 'release'
 
 define('GNUSOCIAL_VERSION', GNUSOCIAL_BASE_VERSION . '-' . GNUSOCIAL_LIFECYCLE);
 
diff --git a/plugins/AccountManager/AccountManagerPlugin.php b/plugins/AccountManager/AccountManagerPlugin.php
index 429e9d4e5e..1aea7f72e4 100644
--- a/plugins/AccountManager/AccountManagerPlugin.php
+++ b/plugins/AccountManager/AccountManagerPlugin.php
@@ -33,6 +33,8 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
 
 class AccountManagerPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     const AM_REL = 'acct-mgmt';
 
     function __construct()
@@ -77,7 +79,7 @@ class AccountManagerPlugin extends Plugin
     }
 
     function onLoginAction($action, &$login) {
-        switch ($action) 
+        switch ($action)
         {
          case 'AccountManagementControlDocument':
             $login = true;
@@ -90,7 +92,7 @@ class AccountManagerPlugin extends Plugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'AccountManager',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Craig Andrews',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/AccountManager',
                             'rawdescription' =>
diff --git a/plugins/Activity/ActivityPlugin.php b/plugins/Activity/ActivityPlugin.php
index 0f306a427c..29dbb13f3c 100644
--- a/plugins/Activity/ActivityPlugin.php
+++ b/plugins/Activity/ActivityPlugin.php
@@ -46,7 +46,7 @@ if (!defined('STATUSNET')) {
  */
 class ActivityPlugin extends Plugin
 {
-    const VERSION = '0.1';
+    const PLUGIN_VERSION = '0.1.0';
     const SOURCE  = 'activity';
 
     // Flags to switch off certain activity notices
@@ -342,7 +342,7 @@ class ActivityPlugin extends Plugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'Activity',
-                            'version' => self::VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Evan Prodromou',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/Activity',
                             'rawdescription' =>
diff --git a/plugins/ActivitySpam/ActivitySpamPlugin.php b/plugins/ActivitySpam/ActivitySpamPlugin.php
index d63d64c718..7c9287437d 100644
--- a/plugins/ActivitySpam/ActivitySpamPlugin.php
+++ b/plugins/ActivitySpam/ActivitySpamPlugin.php
@@ -36,7 +36,7 @@ if (!defined('STATUSNET')) {
 
 /**
  * Check new notices with activity spam service.
- * 
+ *
  * @category  Spam
  * @package   StatusNet
  * @author    Evan Prodromou <evan@status.net>
@@ -46,6 +46,8 @@ if (!defined('STATUSNET')) {
  */
 class ActivitySpamPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     public $server = null;
     public $hideSpam = false;
 
@@ -67,7 +69,7 @@ class ActivitySpamPlugin extends Plugin
 
         // Let DB_DataObject find Spam_score
 
-        common_config_set('db', 'class_location', 
+        common_config_set('db', 'class_location',
                           common_config('db', 'class_location') .':'.dirname(__FILE__));
 
         return true;
@@ -94,7 +96,7 @@ class ActivitySpamPlugin extends Plugin
 
     /**
      * When a notice is saved, check its spam score
-     * 
+     *
      * @param Notice $notice Notice that was just saved
      *
      * @return boolean hook value; true means continue processing, false means stop.
@@ -111,7 +113,7 @@ class ActivitySpamPlugin extends Plugin
             $this->log(LOG_INFO, "Notice " . $notice->id . " has spam score " . $score->score);
 
         } catch (Exception $e) {
-            // Log but continue 
+            // Log but continue
             $this->log(LOG_ERR, $e->getMessage());
         }
 
@@ -171,7 +173,7 @@ class ActivitySpamPlugin extends Plugin
 
         return true;
     }
-    
+
     /**
      * Map URLs to actions
      *
@@ -218,7 +220,7 @@ class ActivitySpamPlugin extends Plugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'ActivitySpam',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Evan Prodromou',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/ActivitySpam',
                             'description' =>
diff --git a/plugins/ActivityVerb/ActivityVerbPlugin.php b/plugins/ActivityVerb/ActivityVerbPlugin.php
index 368c2f11b7..4d92e36665 100644
--- a/plugins/ActivityVerb/ActivityVerbPlugin.php
+++ b/plugins/ActivityVerb/ActivityVerbPlugin.php
@@ -31,6 +31,7 @@ if (!defined('GNUSOCIAL')) { exit(1); }
 
 class ActivityVerbPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
 
     public function onRouterInitialized(URLMapper $m)
     {
@@ -47,7 +48,7 @@ class ActivityVerbPlugin extends Plugin
     public function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'Activity Verb',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Mikael Nordfeldth',
                             'homepage' => 'https://www.gnu.org/software/social/',
                             'rawdescription' =>
diff --git a/plugins/ActivityVerbPost/ActivityVerbPostPlugin.php b/plugins/ActivityVerbPost/ActivityVerbPostPlugin.php
index 64ffe57cd4..0185d534d7 100644
--- a/plugins/ActivityVerbPost/ActivityVerbPostPlugin.php
+++ b/plugins/ActivityVerbPost/ActivityVerbPostPlugin.php
@@ -25,6 +25,8 @@ if (!defined('GNUSOCIAL')) { exit(1); }
  */
 class ActivityVerbPostPlugin extends ActivityVerbHandlerPlugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     // TODO: Implement a "fallback" feature which can handle anything _as_ an activityobject "note"
 
     public function tag()
@@ -128,7 +130,7 @@ class ActivityVerbPostPlugin extends ActivityVerbHandlerPlugin
     public function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'Post verb',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Mikael Nordfeldth',
                             'homepage' => 'https://gnu.io/',
                             'rawdescription' =>
diff --git a/plugins/AnonymousFave/AnonymousFavePlugin.php b/plugins/AnonymousFave/AnonymousFavePlugin.php
index ca4bdc832f..47471ef390 100644
--- a/plugins/AnonymousFave/AnonymousFavePlugin.php
+++ b/plugins/AnonymousFave/AnonymousFavePlugin.php
@@ -43,7 +43,7 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-define('ANONYMOUS_FAVE_PLUGIN_VERSION', '0.1');
+define('ANONYMOUS_FAVE_PLUGIN_VERSION', '0.1.0');
 
 /**
  * Anonymous Fave plugin to allow anonymous (not logged in) users
diff --git a/plugins/AntiBrute/AntiBrutePlugin.php b/plugins/AntiBrute/AntiBrutePlugin.php
index c2291cbf1d..0c18635675 100644
--- a/plugins/AntiBrute/AntiBrutePlugin.php
+++ b/plugins/AntiBrute/AntiBrutePlugin.php
@@ -3,6 +3,7 @@
 if (!defined('GNUSOCIAL')) { exit(1); }
 
 class AntiBrutePlugin extends Plugin {
+    const PLUGIN_VERSION = '2.0.0';
     protected $failed_attempts = 0;
     protected $unauthed_user = null;
     protected $client_ip = null;
@@ -71,7 +72,7 @@ class AntiBrutePlugin extends Plugin {
     public function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'AntiBrute',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Mikael Nordfeldth',
                             'homepage' => 'http://gnu.io/',
                             'description' =>
diff --git a/plugins/ApiLogger/ApiLoggerPlugin.php b/plugins/ApiLogger/ApiLoggerPlugin.php
index 3877c464f0..ee28e8d8a4 100644
--- a/plugins/ApiLogger/ApiLoggerPlugin.php
+++ b/plugins/ApiLogger/ApiLoggerPlugin.php
@@ -28,6 +28,7 @@ if (!defined('STATUSNET')) {
 
 class ApiLoggerPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
     // Lower this to do random sampling of API requests rather than all.
     // 0.1 will check about 10% of hits, etc.
     public $frequency = 1.0;
@@ -78,7 +79,7 @@ class ApiLoggerPlugin extends Plugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'ApiLogger',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Brion Vibber',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/ApiLogger',
                             'rawdescription' =>
diff --git a/plugins/AuthCrypt/AuthCryptPlugin.php b/plugins/AuthCrypt/AuthCryptPlugin.php
index 62019aa015..b213e0483c 100644
--- a/plugins/AuthCrypt/AuthCryptPlugin.php
+++ b/plugins/AuthCrypt/AuthCryptPlugin.php
@@ -32,6 +32,7 @@ if (!defined('GNUSOCIAL')) { exit(1); }
 
 class AuthCryptPlugin extends AuthenticationPlugin
 {
+    const PLUGIN_VERSION = '2.0.0';
     protected $hash         = '$6$';    // defaults to SHA512, i.e. '$6$', in onInitializePlugin()
     protected $statusnet    = true;     // if true, also check StatusNet style password hash
     protected $overwrite    = true;     // if true, password change means overwrite with crypt()
@@ -153,7 +154,7 @@ class AuthCryptPlugin extends AuthenticationPlugin
     public function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'AuthCrypt',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Mikael Nordfeldth',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/AuthCrypt',
                             'rawdescription' =>
diff --git a/plugins/AutoSandbox/AutoSandboxPlugin.php b/plugins/AutoSandbox/AutoSandboxPlugin.php
index 706523564a..269f7d3b0d 100644
--- a/plugins/AutoSandbox/AutoSandboxPlugin.php
+++ b/plugins/AutoSandbox/AutoSandboxPlugin.php
@@ -38,6 +38,7 @@ define('AUTOSANDBOX', '0.1');
 
 class AutoSandboxPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
     var $contact;
     var $debug;
 
@@ -59,7 +60,7 @@ class AutoSandboxPlugin extends Plugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'AutoSandbox',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Sean Carmody',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/AutoSandbox',
                             'rawdescription' =>
diff --git a/plugins/Autocomplete/AutocompletePlugin.php b/plugins/Autocomplete/AutocompletePlugin.php
index 55bdb8894a..9f6ef401cf 100644
--- a/plugins/Autocomplete/AutocompletePlugin.php
+++ b/plugins/Autocomplete/AutocompletePlugin.php
@@ -34,6 +34,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
 
 class AutocompletePlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
     function __construct()
     {
         parent::__construct();
@@ -55,7 +56,7 @@ class AutocompletePlugin extends Plugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'Autocomplete',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Craig Andrews',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/Autocomplete',
                             'rawdescription' =>
diff --git a/plugins/Awesomeness/AwesomenessPlugin.php b/plugins/Awesomeness/AwesomenessPlugin.php
index fff833d4ee..1416676c93 100644
--- a/plugins/Awesomeness/AwesomenessPlugin.php
+++ b/plugins/Awesomeness/AwesomenessPlugin.php
@@ -42,13 +42,13 @@ if (!defined('STATUSNET')) {
 
 class AwesomenessPlugin extends Plugin
 {
-    const VERSION = '0.0.42';
+    const PLUGIN_VERSION = '0.0.42';
 
     public function onPluginVersion(array &$versions)
     {
         $versions[] = array(
             'name' => 'Awesomeness',
-            'version' => self::VERSION,
+            'version' => self::PLUGIN_VERSION,
             'author' => 'Jeroen De Dauw',
             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/Awesomeness',
             // TRANS: Plugin description for a sample plugin.
diff --git a/plugins/BitlyUrl/BitlyUrlPlugin.php b/plugins/BitlyUrl/BitlyUrlPlugin.php
index d3c1ac1218..fd9a24b2ca 100644
--- a/plugins/BitlyUrl/BitlyUrlPlugin.php
+++ b/plugins/BitlyUrl/BitlyUrlPlugin.php
@@ -35,6 +35,8 @@ if (!defined('STATUSNET')) {
 
 class BitlyUrlPlugin extends UrlShortenerPlugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     public $shortenerName = 'bit.ly';
     public $serviceUrl = 'http://api.bit.ly/v3/shorten?longUrl=%s';
     public $login; // To set a site-default when admins or users don't override it.
@@ -147,7 +149,7 @@ class BitlyUrlPlugin extends UrlShortenerPlugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => sprintf('BitlyUrl (%s)', $this->shortenerName),
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Craig Andrews, Brion Vibber',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/BitlyUrl',
                             'rawdescription' =>
diff --git a/plugins/Blacklist/BlacklistPlugin.php b/plugins/Blacklist/BlacklistPlugin.php
index 1572903f2e..6d4ded70c4 100644
--- a/plugins/Blacklist/BlacklistPlugin.php
+++ b/plugins/Blacklist/BlacklistPlugin.php
@@ -40,7 +40,7 @@ if (!defined('GNUSOCIAL')) { exit(1); }
  */
 class BlacklistPlugin extends Plugin
 {
-    const VERSION = GNUSOCIAL_VERSION;
+    const PLUGIN_VERSION = '2.0.0';
 
     public $nicknames = array();
     public $urls      = array();
@@ -265,7 +265,7 @@ class BlacklistPlugin extends Plugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'Blacklist',
-                            'version' => self::VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Evan Prodromou',
                             'homepage' =>
                             'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/Blacklist',
diff --git a/plugins/BlankAd/BlankAdPlugin.php b/plugins/BlankAd/BlankAdPlugin.php
index fbcf70bb03..5670d544af 100644
--- a/plugins/BlankAd/BlankAdPlugin.php
+++ b/plugins/BlankAd/BlankAdPlugin.php
@@ -53,6 +53,7 @@ if (!defined('STATUSNET')) {
  */
 class BlankAdPlugin extends UAPPlugin
 {
+    const PLUGIN_VERSION = '2.0.0';
     /**
      * Show a medium rectangle 'ad'
      *
@@ -120,7 +121,7 @@ class BlankAdPlugin extends UAPPlugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'BlankAd',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Evan Prodromou',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/BlankAdPlugin',
                             'rawdescription' =>
diff --git a/plugins/BlogspamNet/BlogspamNetPlugin.php b/plugins/BlogspamNet/BlogspamNetPlugin.php
index 30e9cffe16..b12877f9d7 100644
--- a/plugins/BlogspamNet/BlogspamNetPlugin.php
+++ b/plugins/BlogspamNet/BlogspamNetPlugin.php
@@ -32,7 +32,7 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-define('BLOGSPAMNETPLUGIN_VERSION', '0.1');
+define('PLUGIN_VERSION', '0.1.0');
 
 /**
  * Plugin to check submitted notices with blogspam.net
@@ -145,13 +145,13 @@ class BlogspamNetPlugin extends Plugin
 
     function version()
     {
-        return BLOGSPAMNETPLUGIN_VERSION;
+        return PLUGIN_VERSION;
     }
 
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'BlogspamNet',
-                            'version' => BLOGSPAMNETPLUGIN_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Evan Prodromou, Brion Vibber',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/BlogspamNet',
                             'rawdescription' =>
diff --git a/plugins/Bookmark/BookmarkPlugin.php b/plugins/Bookmark/BookmarkPlugin.php
index e6afa0b6da..98e9a3881c 100644
--- a/plugins/Bookmark/BookmarkPlugin.php
+++ b/plugins/Bookmark/BookmarkPlugin.php
@@ -43,7 +43,7 @@ if (!defined('GNUSOCIAL')) { exit(1); }
  */
 class BookmarkPlugin extends MicroAppPlugin
 {
-    const VERSION         = '0.1';
+    const PLUGIN_VERSION         = '0.1.0';
     const IMPORTDELICIOUS = 'BookmarkPlugin:IMPORTDELICIOUS';
 
     /**
@@ -180,7 +180,7 @@ class BookmarkPlugin extends MicroAppPlugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'Bookmark',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Evan Prodromou, Stephane Berube, Jean Baptiste Favre, Mikael Nordfeldth',
                             'homepage' => 'https://gnu.io/social',
                             'description' =>
diff --git a/plugins/CacheLog/CacheLogPlugin.php b/plugins/CacheLog/CacheLogPlugin.php
index cf7e3a9884..d83402e6c2 100644
--- a/plugins/CacheLog/CacheLogPlugin.php
+++ b/plugins/CacheLog/CacheLogPlugin.php
@@ -52,6 +52,8 @@ if (!defined('STATUSNET')) {
  */
 class CacheLogPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     function onStartCacheGet(&$key, &$value)
     {
         $this->log(LOG_INFO, "Fetching key '$key'");
@@ -99,7 +101,7 @@ class CacheLogPlugin extends Plugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'CacheLog',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Evan Prodromou',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/CacheLog',
                             'description' =>
diff --git a/plugins/CasAuthentication/CasAuthenticationPlugin.php b/plugins/CasAuthentication/CasAuthenticationPlugin.php
index 02ed4cb166..17c5f49d7e 100644
--- a/plugins/CasAuthentication/CasAuthenticationPlugin.php
+++ b/plugins/CasAuthentication/CasAuthenticationPlugin.php
@@ -36,6 +36,8 @@ set_include_path(get_include_path() . PATH_SEPARATOR . dirname(__FILE__) . '/ext
 
 class CasAuthenticationPlugin extends AuthenticationPlugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     public $server;
     public $port = 443;
     public $path = '';
@@ -152,7 +154,7 @@ class CasAuthenticationPlugin extends AuthenticationPlugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'CAS Authentication',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Craig Andrews',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/CasAuthentication',
                             // TRANS: Plugin description. CAS is Central Authentication Service.
diff --git a/plugins/ChooseTheme/ChooseThemePlugin.php b/plugins/ChooseTheme/ChooseThemePlugin.php
index b54e3d09a6..fe7ba52e86 100644
--- a/plugins/ChooseTheme/ChooseThemePlugin.php
+++ b/plugins/ChooseTheme/ChooseThemePlugin.php
@@ -23,6 +23,7 @@
  */
 
 class ChooseThemePlugin extends Plugin {
+    const PLUGIN_VERSION = '0.1.0';
 
     public function onRouterInitialized(URLMapper $m) {
         $m->connect('main/choosethemesettings', array('action' => 'choosethemesettings'));
@@ -31,7 +32,7 @@ class ChooseThemePlugin extends Plugin {
     public function onPluginVersion(array &$versions) {
 		
         $versions[] = array('name' => 'ChooseTheme',
-                            'version' => '0.1',
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Knut Erik "abjectio" Hollund',
                             'homepage' => 'https://gitlab.com/kollektivet0x242/gsp-choosetheme',
                             'rawdescription' =>
diff --git a/plugins/ClientSideShorten/ClientSideShortenPlugin.php b/plugins/ClientSideShorten/ClientSideShortenPlugin.php
index 0e4e7969aa..d341f0258f 100644
--- a/plugins/ClientSideShorten/ClientSideShortenPlugin.php
+++ b/plugins/ClientSideShorten/ClientSideShortenPlugin.php
@@ -33,6 +33,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
 
 class ClientSideShortenPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
     function __construct()
     {
         parent::__construct();
@@ -57,7 +58,7 @@ class ClientSideShortenPlugin extends Plugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'Shorten',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Craig Andrews',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/ClientSideShorten',
                             'rawdescription' =>
diff --git a/plugins/Comet/CometPlugin.php b/plugins/Comet/CometPlugin.php
index 83c4e70990..6e66846841 100644
--- a/plugins/Comet/CometPlugin.php
+++ b/plugins/Comet/CometPlugin.php
@@ -44,6 +44,8 @@ require_once INSTALLDIR.'/plugins/Realtime/RealtimePlugin.php';
  */
 class CometPlugin extends RealtimePlugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     public $server   = null;
     public $username = null;
     public $password = null;
@@ -107,7 +109,7 @@ class CometPlugin extends RealtimePlugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'Comet',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Evan Prodromou',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/Comet',
                             'rawdescription' =>
diff --git a/plugins/ConversationTree/ConversationTreePlugin.php b/plugins/ConversationTree/ConversationTreePlugin.php
index 042677f824..83d9742b64 100644
--- a/plugins/ConversationTree/ConversationTreePlugin.php
+++ b/plugins/ConversationTree/ConversationTreePlugin.php
@@ -25,6 +25,8 @@ if (!defined('GNUSOCIAL')) { exit(1); }
  */
 class ConversationTreePlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     public function onStartShowConversation(Action $action, Conversation $conv, Profile $scoped=null) {
         $nl = new ConversationTree($conv->getNotices($action->getScoped()), $action);
         $cnt = $nl->show();
@@ -34,7 +36,7 @@ class ConversationTreePlugin extends Plugin
     public function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'ConversationTree',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Mikael Nordfeldth',
                             'homepage' => 'http://gnu.io/',
                             'rawdescription' =>
diff --git a/plugins/Cronish/CronishPlugin.php b/plugins/Cronish/CronishPlugin.php
index e90fa3e34c..1b7a68a47f 100644
--- a/plugins/Cronish/CronishPlugin.php
+++ b/plugins/Cronish/CronishPlugin.php
@@ -13,6 +13,8 @@
 if (!defined('GNUSOCIAL')) { exit(1); }
 
 class CronishPlugin extends Plugin {
+    const PLUGIN_VERSION = '2.0.0';
+
     public function onCronMinutely()
     {
         common_debug('CRON: Running near-minutely cron job!');
@@ -48,7 +50,7 @@ class CronishPlugin extends Plugin {
     public function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'Cronish',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Mikael Nordfeldth',
                             'homepage' => 'http://www.gnu.org/software/social/',
                             'description' =>
diff --git a/plugins/DefaultLayout/DefaultLayoutPlugin.php b/plugins/DefaultLayout/DefaultLayoutPlugin.php
index 3c3846faf3..bfe01d74b7 100644
--- a/plugins/DefaultLayout/DefaultLayoutPlugin.php
+++ b/plugins/DefaultLayout/DefaultLayoutPlugin.php
@@ -31,6 +31,8 @@ if (!defined('GNUSOCIAL')) { exit(1); }
 
 class DefaultLayoutPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     public $prerender_replyforms = false;
 
     public function onEndShowThreadedNoticeTail(NoticeListItem $nli, Notice $notice, array $notices) {
@@ -46,7 +48,7 @@ class DefaultLayoutPlugin extends Plugin
     public function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'Default Layout',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Mikael Nordfeldth',
                             'homepage' => 'https://www.gnu.org/software/social/',
                             'rawdescription' =>
diff --git a/plugins/Diaspora/DiasporaPlugin.php b/plugins/Diaspora/DiasporaPlugin.php
index c054d3b767..3d38e7e853 100644
--- a/plugins/Diaspora/DiasporaPlugin.php
+++ b/plugins/Diaspora/DiasporaPlugin.php
@@ -35,6 +35,8 @@ addPlugin('OStatus');
 
 class DiasporaPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '0.2.0';
+
     const REL_SEED_LOCATION = 'http://joindiaspora.com/seed_location';
     const REL_GUID          = 'http://joindiaspora.com/guid';
     const REL_PUBLIC_KEY    = 'diaspora-public-key';
@@ -79,7 +81,7 @@ class DiasporaPlugin extends Plugin
     public function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'Diaspora',
-                            'version' => '0.2',
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Mikael Nordfeldth',
                             'homepage' => 'https://gnu.io/social',
                             // TRANS: Plugin description.
@@ -148,7 +150,7 @@ class DiasporaPlugin extends Plugin
         /**
          * Encrypt your <decrypted_header> XML snippet using the “outer key”
          * and “outer iv” (using the aes-256-cbc cipher). This encrypted
-         * blob shall be referred to as “the ciphertext”. 
+         * blob shall be referred to as “the ciphertext”.
          */
         $ciphertext = $outer_key->encrypt($decrypted_header, \phpseclib\Crypt\RSA::PADDING_PKCS1);
 
diff --git a/plugins/DirectMessage/DirectMessagePlugin.php b/plugins/DirectMessage/DirectMessagePlugin.php
index de13ef680f..2b500ec807 100644
--- a/plugins/DirectMessage/DirectMessagePlugin.php
+++ b/plugins/DirectMessage/DirectMessagePlugin.php
@@ -24,6 +24,8 @@ if (!defined('GNUSOCIAL')) { exit(1); }
  */
 class DirectMessagePlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     public function onCheckSchema()
     {
         $schema = Schema::get();
@@ -164,7 +166,7 @@ class DirectMessagePlugin extends Plugin
     public function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'Direct Message',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Mikael Nordfeldth',
                             'homepage' => 'http://gnu.io/',
                             'rawdescription' =>
diff --git a/plugins/Directory/DirectoryPlugin.php b/plugins/Directory/DirectoryPlugin.php
index e8ef98969f..1d00a2cdb8 100644
--- a/plugins/Directory/DirectoryPlugin.php
+++ b/plugins/Directory/DirectoryPlugin.php
@@ -44,6 +44,8 @@ if (!defined('STATUSNET')) {
  */
 class DirectoryPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     private $dir = null;
 
     /**
@@ -255,7 +257,7 @@ class DirectoryPlugin extends Plugin
     {
         $versions[] = array(
             'name' => 'Directory',
-            'version' => GNUSOCIAL_VERSION,
+            'version' => self::PLUGIN_VERSION,
             'author' => 'Zach Copley',
             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/Directory',
             // TRANS: Plugin description.
diff --git a/plugins/DiskCache/DiskCachePlugin.php b/plugins/DiskCache/DiskCachePlugin.php
index a574bf5158..3e224253dd 100644
--- a/plugins/DiskCache/DiskCachePlugin.php
+++ b/plugins/DiskCache/DiskCachePlugin.php
@@ -46,6 +46,8 @@ if (!defined('STATUSNET')) {
  */
 class DiskCachePlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     var $root = '/tmp';
 
     function keyToFilename($key)
@@ -164,7 +166,7 @@ class DiskCachePlugin extends Plugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'DiskCache',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Evan Prodromou',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/DiskCache',
                             'rawdescription' =>
diff --git a/plugins/DomainStatusNetwork/DomainStatusNetworkPlugin.php b/plugins/DomainStatusNetwork/DomainStatusNetworkPlugin.php
index 24ca6c90b0..28b29d1f9e 100644
--- a/plugins/DomainStatusNetwork/DomainStatusNetworkPlugin.php
+++ b/plugins/DomainStatusNetwork/DomainStatusNetworkPlugin.php
@@ -52,6 +52,8 @@ require_once $_dir . '/extlib/regDomain.inc.php';
  */
 class DomainStatusNetworkPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     static $_thetree = null;
 
     function initialize()
@@ -193,7 +195,7 @@ class DomainStatusNetworkPlugin extends Plugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'DomainStatusNetwork',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Evan Prodromou',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/DomainStatusNetwork',
                             'rawdescription' =>
diff --git a/plugins/DomainWhitelist/DomainWhitelistPlugin.php b/plugins/DomainWhitelist/DomainWhitelistPlugin.php
index e965cfaa04..8be03df39e 100644
--- a/plugins/DomainWhitelist/DomainWhitelistPlugin.php
+++ b/plugins/DomainWhitelist/DomainWhitelistPlugin.php
@@ -48,6 +48,8 @@ if (!defined('STATUSNET')) {
  */
 class DomainWhitelistPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     /**
      * Get the path to the plugin's installation directory. Used
      * to link in js files and whatnot.
@@ -270,7 +272,7 @@ class DomainWhitelistPlugin extends Plugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'DomainWhitelist',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Evan Prodromou, Zach Copley',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/DomainWhitelist',
                             'rawdescription' =>
diff --git a/plugins/EmailAuthentication/EmailAuthenticationPlugin.php b/plugins/EmailAuthentication/EmailAuthenticationPlugin.php
index fda99a12f8..d3409f3e77 100644
--- a/plugins/EmailAuthentication/EmailAuthenticationPlugin.php
+++ b/plugins/EmailAuthentication/EmailAuthenticationPlugin.php
@@ -31,6 +31,8 @@ if (!defined('GNUSOCIAL')) { exit(1); }
 
 class EmailAuthenticationPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     // $nickname for this plugin is the user's email address
     function onStartCheckPassword($nickname, $password, &$authenticatedUser)
     {
@@ -52,7 +54,7 @@ class EmailAuthenticationPlugin extends Plugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'Email Authentication',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Craig Andrews',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/EmailAuthentication',
                             'rawdescription' =>
diff --git a/plugins/EmailRegistration/EmailRegistrationPlugin.php b/plugins/EmailRegistration/EmailRegistrationPlugin.php
index 378cb6acd1..05868d2444 100644
--- a/plugins/EmailRegistration/EmailRegistrationPlugin.php
+++ b/plugins/EmailRegistration/EmailRegistrationPlugin.php
@@ -47,6 +47,8 @@ if (!defined('STATUSNET')) {
  */
 class EmailRegistrationPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     const CONFIRMTYPE = 'register';
 
     function onArgsInitialize(&$args)
@@ -175,7 +177,7 @@ class EmailRegistrationPlugin extends Plugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'EmailRegistration',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Evan Prodromou',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/EmailRegistration',
                             'rawdescription' =>
diff --git a/plugins/EmailReminder/EmailReminderPlugin.php b/plugins/EmailReminder/EmailReminderPlugin.php
index f30e8d9273..a9372200b3 100644
--- a/plugins/EmailReminder/EmailReminderPlugin.php
+++ b/plugins/EmailReminder/EmailReminderPlugin.php
@@ -46,6 +46,8 @@ if (!defined('STATUSNET')) {
  */
 class EmailReminderPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     /**
      * Set up email_reminder table
      *
@@ -183,7 +185,7 @@ class EmailReminderPlugin extends Plugin
     {
         $versions[] = array(
             'name'           => 'EmailReminder',
-            'version'        => GNUSOCIAL_VERSION,
+            'version'        => self::PLUGIN_VERSION,
             'author'         => 'Zach Copley',
             'homepage'       => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/EmailReminder',
             // TRANS: Plugin description.
diff --git a/plugins/EmailSummary/EmailSummaryPlugin.php b/plugins/EmailSummary/EmailSummaryPlugin.php
index 75985da32e..9e94cd16ee 100644
--- a/plugins/EmailSummary/EmailSummaryPlugin.php
+++ b/plugins/EmailSummary/EmailSummaryPlugin.php
@@ -45,6 +45,7 @@ if (!defined('STATUSNET')) {
  */
 class EmailSummaryPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
     /**
      * Database schema setup
      *
@@ -69,7 +70,7 @@ class EmailSummaryPlugin extends Plugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'EmailSummary',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Evan Prodromou',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/EmailSummary',
                             'rawdescription' =>
diff --git a/plugins/Event/EventPlugin.php b/plugins/Event/EventPlugin.php
index 57d11c7757..58f7fabbe9 100644
--- a/plugins/Event/EventPlugin.php
+++ b/plugins/Event/EventPlugin.php
@@ -42,6 +42,8 @@ if (!defined('GNUSOCIAL')) { exit(1); }
  */
 class EventPlugin extends ActivityVerbHandlerPlugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     /**
      * Set up our tables (event and rsvp)
      *
@@ -100,7 +102,7 @@ class EventPlugin extends ActivityVerbHandlerPlugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'Event',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Evan Prodromou',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/Event',
                             'description' =>
diff --git a/plugins/ExtendedProfile/ExtendedProfilePlugin.php b/plugins/ExtendedProfile/ExtendedProfilePlugin.php
index a1717c897e..6ad84378be 100644
--- a/plugins/ExtendedProfile/ExtendedProfilePlugin.php
+++ b/plugins/ExtendedProfile/ExtendedProfilePlugin.php
@@ -29,11 +29,13 @@ if (!defined('STATUSNET')) {
  */
 class ExtendedProfilePlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     function onPluginVersion(array &$versions)
     {
         $versions[] = array(
             'name' => 'ExtendedProfile',
-            'version' => GNUSOCIAL_VERSION,
+            'version' => self::PLUGIN_VERSION,
             'author' => 'Brion Vibber, Samantha Doherty, Zach Copley',
             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/ExtendedProfile',
             // TRANS: Plugin description.
diff --git a/plugins/Favorite/FavoritePlugin.php b/plugins/Favorite/FavoritePlugin.php
index d3a3fa86f7..01fe534724 100644
--- a/plugins/Favorite/FavoritePlugin.php
+++ b/plugins/Favorite/FavoritePlugin.php
@@ -25,6 +25,8 @@ if (!defined('GNUSOCIAL')) { exit(1); }
  */
 class FavoritePlugin extends ActivityVerbHandlerPlugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     protected $email_notify_fave = 1;
 
     public function tag()
@@ -558,7 +560,7 @@ class FavoritePlugin extends ActivityVerbHandlerPlugin
     public function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'Favorite',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Mikael Nordfeldth',
                             'homepage' => 'http://gnu.io/',
                             'rawdescription' =>
diff --git a/plugins/FeedPoller/FeedPollerPlugin.php b/plugins/FeedPoller/FeedPollerPlugin.php
index 2326cd2f1b..c9e68ba863 100644
--- a/plugins/FeedPoller/FeedPollerPlugin.php
+++ b/plugins/FeedPoller/FeedPollerPlugin.php
@@ -13,6 +13,8 @@
 if (!defined('GNUSOCIAL')) { exit(1); }
 
 class FeedPollerPlugin extends Plugin {
+    const PLUGIN_VERSION = '2.0.0';
+
     public $interval = 5;   // interval in minutes for feed checks
 
     public function onEndInitializeQueueManager(QueueManager $qm)
@@ -50,7 +52,7 @@ class FeedPollerPlugin extends Plugin {
     public function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'FeedPoller',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Mikael Nordfeldth',
                             'homepage' => 'http://www.gnu.org/software/social/',
                             'description' =>
diff --git a/plugins/FetchRemote/FetchRemotePlugin.php b/plugins/FetchRemote/FetchRemotePlugin.php
index 40d7550c58..9dda9b58d9 100644
--- a/plugins/FetchRemote/FetchRemotePlugin.php
+++ b/plugins/FetchRemote/FetchRemotePlugin.php
@@ -30,6 +30,8 @@ if (!defined('GNUSOCIAL')) { exit(1); }
 
 class FetchRemotePlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     static function fetchNoticeFromUrl($url)
     {
         if (!common_valid_http_url($url)) {
@@ -108,7 +110,7 @@ class FetchRemotePlugin extends Plugin
     public function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'FetchRemote',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Mikael Nordfeldth',
                             'homepage' => 'http://www.gnu.org/software/social/',
                             // TRANS: Plugin description.
diff --git a/plugins/FollowEveryone/FollowEveryonePlugin.php b/plugins/FollowEveryone/FollowEveryonePlugin.php
index 58aae85ed0..d8b1b8e67f 100644
--- a/plugins/FollowEveryone/FollowEveryonePlugin.php
+++ b/plugins/FollowEveryone/FollowEveryonePlugin.php
@@ -48,6 +48,8 @@ if (!defined('STATUSNET')) {
  */
 class FollowEveryonePlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     /**
      * Called when a new user is registered.
      *
@@ -168,7 +170,7 @@ class FollowEveryonePlugin extends Plugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'FollowEveryone',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Evan Prodromou',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/FollowEveryone',
                             'rawdescription' =>
diff --git a/plugins/ForceGroup/ForceGroupPlugin.php b/plugins/ForceGroup/ForceGroupPlugin.php
index e0ab59822e..3f18f98a69 100644
--- a/plugins/ForceGroup/ForceGroupPlugin.php
+++ b/plugins/ForceGroup/ForceGroupPlugin.php
@@ -26,6 +26,8 @@ if (!defined('STATUSNET')) { exit(1); }
 
 class ForceGroupPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     /**
      * Members of these groups will have all their posts mirrored into
      * the group even if they don't explicitly mention it.
@@ -110,7 +112,7 @@ class ForceGroupPlugin extends Plugin
         $url = 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/ForceGroup';
 
         $versions[] = array('name' => 'ForceGroup',
-            'version' => GNUSOCIAL_VERSION,
+            'version' => self::PLUGIN_VERSION,
             'author' => 'Brion Vibber',
             'homepage' => $url,
             'rawdescription' =>
diff --git a/plugins/GeoURL/GeoURLPlugin.php b/plugins/GeoURL/GeoURLPlugin.php
index be47bd5d27..cc22364f35 100644
--- a/plugins/GeoURL/GeoURLPlugin.php
+++ b/plugins/GeoURL/GeoURLPlugin.php
@@ -48,6 +48,8 @@ if (!defined('STATUSNET')) {
  */
 class GeoURLPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     public $ping = 'http://geourl.org/ping/';
 
     /**
@@ -119,7 +121,7 @@ class GeoURLPlugin extends Plugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'GeoURL',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Evan Prodromou',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/GeoURL',
                             'rawdescription' =>
diff --git a/plugins/Geonames/GeonamesPlugin.php b/plugins/Geonames/GeonamesPlugin.php
index 14a95a2114..aa856ea3d1 100644
--- a/plugins/Geonames/GeonamesPlugin.php
+++ b/plugins/Geonames/GeonamesPlugin.php
@@ -48,6 +48,8 @@ if (!defined('STATUSNET')) {
  */
 class GeonamesPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     const LOCATION_NS = 1;
 
     public $host     = 'ws.geonames.org';
@@ -490,7 +492,7 @@ class GeonamesPlugin extends Plugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'Geonames',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Evan Prodromou',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/Geonames',
                             'rawdescription' =>
diff --git a/plugins/GroupFavorited/GroupFavoritedPlugin.php b/plugins/GroupFavorited/GroupFavoritedPlugin.php
index 3c6fbd3af4..350da9400c 100644
--- a/plugins/GroupFavorited/GroupFavoritedPlugin.php
+++ b/plugins/GroupFavorited/GroupFavoritedPlugin.php
@@ -26,6 +26,8 @@ if (!defined('STATUSNET')) { exit(1); }
 
 class GroupFavoritedPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     /**
      * Hook for RouterInitialized event.
      *
@@ -70,7 +72,7 @@ class GroupFavoritedPlugin extends Plugin
         $url = 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/GroupFavorited';
 
         $versions[] = array('name' => 'GroupFavorited',
-            'version' => GNUSOCIAL_VERSION,
+            'version' => self::PLUGIN_VERSION,
             'author' => 'Brion Vibber',
             'homepage' => $url,
             'rawdescription' =>
diff --git a/plugins/GroupPrivateMessage/GroupPrivateMessagePlugin.php b/plugins/GroupPrivateMessage/GroupPrivateMessagePlugin.php
index bee504491f..7aabbe59b1 100644
--- a/plugins/GroupPrivateMessage/GroupPrivateMessagePlugin.php
+++ b/plugins/GroupPrivateMessage/GroupPrivateMessagePlugin.php
@@ -48,6 +48,8 @@ if (!defined('STATUSNET')) {
  */
 class GroupPrivateMessagePlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     /**
      * Database schema setup
      *
@@ -408,7 +410,7 @@ class GroupPrivateMessagePlugin extends Plugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'GroupPrivateMessage',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Evan Prodromou',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/GroupPrivateMessage',
                             'rawdescription' =>
diff --git a/plugins/HTMLPurifierSchemes/HTMLPurifierSchemesPlugin.php b/plugins/HTMLPurifierSchemes/HTMLPurifierSchemesPlugin.php
index d8ca619dec..001cb840b3 100644
--- a/plugins/HTMLPurifierSchemes/HTMLPurifierSchemesPlugin.php
+++ b/plugins/HTMLPurifierSchemes/HTMLPurifierSchemesPlugin.php
@@ -28,10 +28,12 @@ require_once INSTALLDIR.'/extlib/HTMLPurifier/HTMLPurifier.auto.php';
  */
 class HTMLPurifierSchemesPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     public function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'HTMLPurifier Schemes',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Mikael Nordfeldth',
                             'homepage' => 'https://gnu.io/social',
                             'rawdescription' =>
diff --git a/plugins/ImageMagick/ImageMagickPlugin.php b/plugins/ImageMagick/ImageMagickPlugin.php
index 927445211c..1d68a9cb05 100644
--- a/plugins/ImageMagick/ImageMagickPlugin.php
+++ b/plugins/ImageMagick/ImageMagickPlugin.php
@@ -46,6 +46,8 @@ if (!defined('GNUSOCIAL')) { exit(1); }
 
 class ImageMagickPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     public $preview_imageformat = 'PNG';    // Image format strings: http://www.imagemagick.org/script/formats.php#supported
     public $rasterize_vectors = false;       // Whether we want to turn SVG into PNG etc.
 
@@ -135,7 +137,7 @@ class ImageMagickPlugin extends Plugin
     public function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'ImageMagick',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Mikael Nordfeldth',
                             'homepage' => 'http://gnu.io/social',
                             'rawdescription' =>
diff --git a/plugins/Imap/ImapPlugin.php b/plugins/Imap/ImapPlugin.php
index 15bd8159d7..a2da37c2d1 100644
--- a/plugins/Imap/ImapPlugin.php
+++ b/plugins/Imap/ImapPlugin.php
@@ -44,6 +44,8 @@ if (!defined('STATUSNET')) {
  */
 class ImapPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     public $mailbox;
     public $user;
     public $password;
@@ -79,7 +81,7 @@ class ImapPlugin extends Plugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'IMAP',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Craig Andrews',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/IMAP',
                             'rawdescription' =>
diff --git a/plugins/InProcessCache/InProcessCachePlugin.php b/plugins/InProcessCache/InProcessCachePlugin.php
index 4bcfb8e2da..d3e56f4123 100644
--- a/plugins/InProcessCache/InProcessCachePlugin.php
+++ b/plugins/InProcessCache/InProcessCachePlugin.php
@@ -55,6 +55,8 @@ if (!defined('STATUSNET')) {
  */
 class InProcessCachePlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     private $_items = array();
     private $_hits  = array();
     private $active;
@@ -175,7 +177,7 @@ class InProcessCachePlugin extends Plugin
         $url = 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/InProcessCache';
 
         $versions[] = array('name' => 'InProcessCache',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Evan Prodromou',
                             'homepage' => $url,
                             'description' =>
diff --git a/plugins/InfiniteScroll/InfiniteScrollPlugin.php b/plugins/InfiniteScroll/InfiniteScrollPlugin.php
index c9107ad824..2e47d73647 100644
--- a/plugins/InfiniteScroll/InfiniteScrollPlugin.php
+++ b/plugins/InfiniteScroll/InfiniteScrollPlugin.php
@@ -31,6 +31,8 @@ if (!defined('GNUSOCIAL')) { exit(1); }
 
 class InfiniteScrollPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     public $on_next_only = false;
 
     function onEndShowScripts(Action $action)
@@ -44,7 +46,7 @@ class InfiniteScrollPlugin extends Plugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'InfiniteScroll',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Craig Andrews',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/InfiniteScroll',
                             'rawdescription' =>
diff --git a/plugins/LRDD/LRDDPlugin.php b/plugins/LRDD/LRDDPlugin.php
index a7bdb0edbb..2ae6d96775 100644
--- a/plugins/LRDD/LRDDPlugin.php
+++ b/plugins/LRDD/LRDDPlugin.php
@@ -31,6 +31,8 @@ set_include_path(get_include_path() . PATH_SEPARATOR . __DIR__ . '/extlib/');
 
 class LRDDPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     public function onAutoload($cls)
     {
         switch ($cls) {
@@ -55,7 +57,7 @@ class LRDDPlugin extends Plugin
     public function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'LRDD',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Mikael Nordfeldth',
                             'homepage' => 'http://www.gnu.org/software/social/',
                             // TRANS: Plugin description.
diff --git a/plugins/LdapAuthentication/LdapAuthenticationPlugin.php b/plugins/LdapAuthentication/LdapAuthenticationPlugin.php
index 2a09ad7c81..c3e8f305fc 100644
--- a/plugins/LdapAuthentication/LdapAuthenticationPlugin.php
+++ b/plugins/LdapAuthentication/LdapAuthenticationPlugin.php
@@ -33,6 +33,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
 
 class LdapAuthenticationPlugin extends AuthenticationPlugin
 {
+    const PLUGIN_VERSION = '2.0.0';
     function onInitializePlugin(){
         parent::onInitializePlugin();
         if(!isset($this->attributes['nickname'])){
@@ -145,7 +146,7 @@ class LdapAuthenticationPlugin extends AuthenticationPlugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'LDAP Authentication',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Craig Andrews',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/LdapAuthentication',
                             'rawdescription' =>
diff --git a/plugins/LdapAuthorization/LdapAuthorizationPlugin.php b/plugins/LdapAuthorization/LdapAuthorizationPlugin.php
index fb86ba57b8..4e6c380610 100644
--- a/plugins/LdapAuthorization/LdapAuthorizationPlugin.php
+++ b/plugins/LdapAuthorization/LdapAuthorizationPlugin.php
@@ -33,6 +33,8 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
 
 class LdapAuthorizationPlugin extends AuthorizationPlugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     public $roles_to_groups = array();
     public $login_group = null;
 
@@ -121,7 +123,7 @@ class LdapAuthorizationPlugin extends AuthorizationPlugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'LDAP Authorization',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Craig Andrews',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/LdapAuthorization',
                             'rawdescription' =>
diff --git a/plugins/LilUrl/LilUrlPlugin.php b/plugins/LilUrl/LilUrlPlugin.php
index 1e4d135cc3..9a5d840caa 100644
--- a/plugins/LilUrl/LilUrlPlugin.php
+++ b/plugins/LilUrl/LilUrlPlugin.php
@@ -33,6 +33,8 @@ if (!defined('STATUSNET')) {
 
 class LilUrlPlugin extends UrlShortenerPlugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     public $serviceUrl;
 
     function onInitializePlugin(){
@@ -60,7 +62,7 @@ class LilUrlPlugin extends UrlShortenerPlugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => sprintf('LilUrl (%s)', $this->shortenerName),
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Craig Andrews',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/LilUrl',
                             'rawdescription' =>
diff --git a/plugins/LinkPreview/LinkPreviewPlugin.php b/plugins/LinkPreview/LinkPreviewPlugin.php
index 25e31f3f79..1e735cab8e 100644
--- a/plugins/LinkPreview/LinkPreviewPlugin.php
+++ b/plugins/LinkPreview/LinkPreviewPlugin.php
@@ -29,10 +29,12 @@ if (!defined('STATUSNET')) {
  */
 class LinkPreviewPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'LinkPreview',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Brion Vibber',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/LinkPreview',
                             'rawdescription' =>
diff --git a/plugins/LogFilter/LogFilterPlugin.php b/plugins/LogFilter/LogFilterPlugin.php
index f0794af4a3..bbe06f4a4b 100644
--- a/plugins/LogFilter/LogFilterPlugin.php
+++ b/plugins/LogFilter/LogFilterPlugin.php
@@ -35,6 +35,8 @@ if (!defined('STATUSNET')) {
  */
 class LogFilterPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     public $default = true;     // Set to false to require opting things in
     public $priority = array(); // override by priority: array(LOG_ERR => true, LOG_DEBUG => false)
     public $regex = array();    // override by regex match of message: array('/twitter/i' => false)
@@ -42,7 +44,7 @@ class LogFilterPlugin extends Plugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'LogFilter',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Brion Vibber',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/LogFilter',
                             'rawdescription' =>
diff --git a/plugins/Mapstraction/MapstractionPlugin.php b/plugins/Mapstraction/MapstractionPlugin.php
index ddc54bcc15..9c7b1190af 100644
--- a/plugins/Mapstraction/MapstractionPlugin.php
+++ b/plugins/Mapstraction/MapstractionPlugin.php
@@ -46,7 +46,7 @@ if (!defined('STATUSNET')) {
  */
 class MapstractionPlugin extends Plugin
 {
-    const VERSION = GNUSOCIAL_VERSION;
+    const PLUGIN_VERSION = '2.0.0';
 
     /** provider name, one of:
      'cloudmade', 'microsoft', 'openlayers', 'yahoo' */
@@ -168,7 +168,7 @@ class MapstractionPlugin extends Plugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'Mapstraction',
-                            'version' => self::VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Evan Prodromou',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/Mapstraction',
                             'rawdescription' =>
diff --git a/plugins/Memcache/MemcachePlugin.php b/plugins/Memcache/MemcachePlugin.php
index dc0f943675..1d85386a2d 100644
--- a/plugins/Memcache/MemcachePlugin.php
+++ b/plugins/Memcache/MemcachePlugin.php
@@ -50,6 +50,8 @@ if (!defined('STATUSNET')) {
  */
 class MemcachePlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     static $cacheInitialized = false;
 
     private $_conn  = null;
@@ -239,7 +241,7 @@ class MemcachePlugin extends Plugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'Memcache',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Evan Prodromou, Craig Andrews',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/Memcache',
                             'rawdescription' =>
diff --git a/plugins/Memcached/MemcachedPlugin.php b/plugins/Memcached/MemcachedPlugin.php
index 33b7772db4..061e43469e 100644
--- a/plugins/Memcached/MemcachedPlugin.php
+++ b/plugins/Memcached/MemcachedPlugin.php
@@ -54,6 +54,8 @@ if (!defined('STATUSNET')) {
  */
 class MemcachedPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     static $cacheInitialized = false;
 
     private $_conn  = null;
@@ -210,7 +212,7 @@ class MemcachedPlugin extends Plugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'Memcached',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Evan Prodromou, Craig Andrews',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/Memcached',
                             'rawdescription' =>
diff --git a/plugins/MentionURL/MentionURLPlugin.php b/plugins/MentionURL/MentionURLPlugin.php
index f76aa8b28d..182a60076f 100644
--- a/plugins/MentionURL/MentionURLPlugin.php
+++ b/plugins/MentionURL/MentionURLPlugin.php
@@ -10,6 +10,8 @@ require_once __DIR__ . '/lib/util.php';
  */
 class MentionURLPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     function onEndFindMentions(Profile $sender, $text, &$mentions)
     {
         $matches = array();
@@ -73,7 +75,7 @@ class MentionURLPlugin extends Plugin
     public function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'MentionURL',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Stephen Paul Weber',
                             'homepage' => 'http://gnu.io/',
                             'description' =>
diff --git a/plugins/Meteor/MeteorPlugin.php b/plugins/Meteor/MeteorPlugin.php
index 9ce25386c1..432769ef27 100644
--- a/plugins/Meteor/MeteorPlugin.php
+++ b/plugins/Meteor/MeteorPlugin.php
@@ -44,6 +44,8 @@ require_once INSTALLDIR.'/plugins/Realtime/RealtimePlugin.php';
  */
 class MeteorPlugin extends RealtimePlugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     public $webserver     = null;
     public $webport       = null;
     public $controlport   = null;
@@ -163,7 +165,7 @@ class MeteorPlugin extends RealtimePlugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'Meteor',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Evan Prodromou',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/Meteor',
                             'rawdescription' =>
diff --git a/plugins/MobileProfile/MobileProfilePlugin.php b/plugins/MobileProfile/MobileProfilePlugin.php
index 0e0ba170e8..666ca74c00 100644
--- a/plugins/MobileProfile/MobileProfilePlugin.php
+++ b/plugins/MobileProfile/MobileProfilePlugin.php
@@ -45,6 +45,8 @@ require_once INSTALLDIR.'/plugins/Mobile/WAP20Plugin.php';
  */
 class MobileProfilePlugin extends WAP20Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     public $DTD            = null;
     public $serveMobile    = false;
     public $reallyMobile   = false;
@@ -371,7 +373,7 @@ class MobileProfilePlugin extends WAP20Plugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'MobileProfile',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Sarven Capadisli',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/MobileProfile',
                             'rawdescription' =>
diff --git a/plugins/ModHelper/ModHelperPlugin.php b/plugins/ModHelper/ModHelperPlugin.php
index 45b8bf27d1..5be03dfcb4 100644
--- a/plugins/ModHelper/ModHelperPlugin.php
+++ b/plugins/ModHelper/ModHelperPlugin.php
@@ -25,12 +25,14 @@ if (!defined('GNUSOCIAL')) { exit(1); }
  */
 class ModHelperPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     static $rights = array(Right::SILENCEUSER, Right::TRAINSPAM, Right::REVIEWSPAM);
 
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'ModHelper',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Brion Vibber',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/ModHelper',
                             'rawdescription' =>
diff --git a/plugins/ModLog/ModLogPlugin.php b/plugins/ModLog/ModLogPlugin.php
index 84912ac914..146c9b4b4a 100644
--- a/plugins/ModLog/ModLogPlugin.php
+++ b/plugins/ModLog/ModLogPlugin.php
@@ -49,6 +49,7 @@ if (!defined('STATUSNET')) {
 
 class ModLogPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
     const VIEWMODLOG = 'ModLogPlugin::VIEWMODLOG';
 
     /**
@@ -187,7 +188,7 @@ class ModLogPlugin extends Plugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'ModLog',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Evan Prodromou',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/ModLog',
                             'description' =>
diff --git a/plugins/ModPlus/ModPlusPlugin.php b/plugins/ModPlus/ModPlusPlugin.php
index 9facd12ef2..94a23c0b46 100644
--- a/plugins/ModPlus/ModPlusPlugin.php
+++ b/plugins/ModPlus/ModPlusPlugin.php
@@ -27,10 +27,12 @@ if (!defined('GNUSOCIAL')) { exit(1); }
  */
 class ModPlusPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'ModPlus',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Brion Vibber',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/ModPlus',
                             'rawdescription' =>
diff --git a/plugins/Nodeinfo/NodeinfoPlugin.php b/plugins/Nodeinfo/NodeinfoPlugin.php
index 07a86e93f7..8fe6a7999a 100644
--- a/plugins/Nodeinfo/NodeinfoPlugin.php
+++ b/plugins/Nodeinfo/NodeinfoPlugin.php
@@ -6,7 +6,7 @@ if (!defined('GNUSOCIAL')) {
 
 class NodeinfoPlugin extends Plugin
 {
-    const VERSION = '0.0.1';
+    const VERSION = '1.0.1';
 
     public function onRouterInitialized($m)
     {
diff --git a/plugins/OStatus/OStatusPlugin.php b/plugins/OStatus/OStatusPlugin.php
index 10d8e4350d..6ee120226f 100644
--- a/plugins/OStatus/OStatusPlugin.php
+++ b/plugins/OStatus/OStatusPlugin.php
@@ -30,6 +30,8 @@ if (!defined('GNUSOCIAL')) { exit(1); }
 
 class OStatusPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     /**
      * Hook for RouterInitialized event.
      *
@@ -1350,7 +1352,7 @@ class OStatusPlugin extends Plugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'OStatus',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Evan Prodromou, James Walker, Brion Vibber, Zach Copley',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/OStatus',
                             // TRANS: Plugin description.
diff --git a/plugins/Oembed/OembedPlugin.php b/plugins/Oembed/OembedPlugin.php
index ce4803c506..d70f79e59f 100644
--- a/plugins/Oembed/OembedPlugin.php
+++ b/plugins/Oembed/OembedPlugin.php
@@ -4,6 +4,8 @@ if (!defined('GNUSOCIAL')) { exit(1); }
 
 class OembedPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     // settings which can be set in config.php with addPlugin('Oembed', array('param'=>'value', ...));
     // WARNING, these are _regexps_ (slashes added later). Always escape your dots and end your strings
     public $domain_whitelist = array(       // hostname => service provider
@@ -451,7 +453,7 @@ class OembedPlugin extends Plugin
     public function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'Oembed',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Mikael Nordfeldth',
                             'homepage' => 'http://gnu.io/',
                             'description' =>
diff --git a/plugins/OfflineBackup/OfflineBackupPlugin.php b/plugins/OfflineBackup/OfflineBackupPlugin.php
index b1c69558ea..ae751b9e60 100644
--- a/plugins/OfflineBackup/OfflineBackupPlugin.php
+++ b/plugins/OfflineBackup/OfflineBackupPlugin.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2011, StatusNet, Inc.
  *
  * Offline backup
- * 
+ *
  * PHP version 5
  *
  * This program is free software: you can redistribute it and/or modify
@@ -37,7 +37,7 @@ if (!defined('STATUSNET')) {
 /**
  * Offline backup
  *
- * Instead of a big 
+ * Instead of a big
  *
  * @category  General
  * @package   StatusNet
@@ -49,6 +49,7 @@ if (!defined('STATUSNET')) {
 
 class OfflineBackupPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
 
     function onRouterInitialized($m)
     {
@@ -74,7 +75,7 @@ class OfflineBackupPlugin extends Plugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'OfflineBackup',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Evan Prodromou',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/OfflineBackup',
                             'rawdescription' =>
diff --git a/plugins/OpenExternalLinkTarget/OpenExternalLinkTargetPlugin.php b/plugins/OpenExternalLinkTarget/OpenExternalLinkTargetPlugin.php
index 89c7cbabfd..a6c8748885 100644
--- a/plugins/OpenExternalLinkTarget/OpenExternalLinkTargetPlugin.php
+++ b/plugins/OpenExternalLinkTarget/OpenExternalLinkTargetPlugin.php
@@ -42,6 +42,8 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
  */
 class OpenExternalLinkTargetPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     function onEndShowScripts($action)
     {
         $action->inlineScript('$(document).on("click", "a[rel~=external]:not([class~=attachment])", function () { window.open(this.href); return false; });');
@@ -52,7 +54,7 @@ class OpenExternalLinkTargetPlugin extends Plugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'OpenExternalLinkTarget',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Sarven Capadisli',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/OpenExternalLinkTarget',
                             'rawdescription' =>
diff --git a/plugins/OpenID/OpenIDPlugin.php b/plugins/OpenID/OpenIDPlugin.php
index c6d247caf3..b8211166e7 100644
--- a/plugins/OpenID/OpenIDPlugin.php
+++ b/plugins/OpenID/OpenIDPlugin.php
@@ -50,6 +50,8 @@ if (!defined('STATUSNET')) {
  */
 class OpenIDPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     // Plugin parameter: set true to disallow non-OpenID logins
     // If set, overrides the setting in database or $config['site']['openidonly']
     public $openidOnly = null;
@@ -595,7 +597,7 @@ class OpenIDPlugin extends Plugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'OpenID',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Evan Prodromou, Craig Andrews',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/OpenID',
                             'rawdescription' =>
diff --git a/plugins/OpenX/OpenXPlugin.php b/plugins/OpenX/OpenXPlugin.php
index f0c78905aa..24516d8a12 100644
--- a/plugins/OpenX/OpenXPlugin.php
+++ b/plugins/OpenX/OpenXPlugin.php
@@ -77,6 +77,8 @@ if (!defined('STATUSNET')) {
  */
 class OpenXPlugin extends UAPPlugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     public $adScript = null;
 
     function initialize()
@@ -202,7 +204,7 @@ ENDOFSCRIPT;
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'OpenX',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Evan Prodromou',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/OpenX',
                             'rawdescription' =>
diff --git a/plugins/OpportunisticQM/OpportunisticQMPlugin.php b/plugins/OpportunisticQM/OpportunisticQMPlugin.php
index 8e0486105f..4dfa32ff4a 100644
--- a/plugins/OpportunisticQM/OpportunisticQMPlugin.php
+++ b/plugins/OpportunisticQM/OpportunisticQMPlugin.php
@@ -1,6 +1,8 @@
 <?php
 
 class OpportunisticQMPlugin extends Plugin {
+    const PLUGIN_VERSION = '2.0.0';
+
     public $qmkey = false;
     public $secs_per_action = 1; // total seconds to run script per action
     public $rel_to_pageload = true;  // relative to pageload or queue start
@@ -37,7 +39,7 @@ class OpportunisticQMPlugin extends Plugin {
     public function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'OpportunisticQM',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Mikael Nordfeldth',
                             'homepage' => 'http://www.gnu.org/software/social/',
                             'description' =>
diff --git a/plugins/Orbited/OrbitedPlugin.php b/plugins/Orbited/OrbitedPlugin.php
index e007eebe7e..2359c02ef8 100644
--- a/plugins/Orbited/OrbitedPlugin.php
+++ b/plugins/Orbited/OrbitedPlugin.php
@@ -47,6 +47,8 @@ require_once INSTALLDIR.'/plugins/Realtime/RealtimePlugin.php';
  */
 class OrbitedPlugin extends RealtimePlugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     public $webserver   = null;
     public $webport     = null;
     public $channelbase = null;
@@ -162,7 +164,7 @@ class OrbitedPlugin extends RealtimePlugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'Orbited',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Evan Prodromou',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/Orbited',
                             'rawdescription' =>
diff --git a/plugins/PiwikAnalytics/PiwikAnalyticsPlugin.php b/plugins/PiwikAnalytics/PiwikAnalyticsPlugin.php
index adc87e66ee..924e36c264 100644
--- a/plugins/PiwikAnalytics/PiwikAnalyticsPlugin.php
+++ b/plugins/PiwikAnalytics/PiwikAnalyticsPlugin.php
@@ -51,6 +51,8 @@ if (!defined('STATUSNET')) {
  */
 class PiwikAnalyticsPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     /** the base of your Piwik installation */
     public $piwikroot = null;
     /** the Piwik Id of your statusnet installation */
@@ -106,7 +108,7 @@ ENDOFPIWIK;
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'PiwikAnalytics',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Tobias Diekershoff, Evan Prodromou',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/Piwik',
                             'rawdescription' =>
diff --git a/plugins/Poll/PollPlugin.php b/plugins/Poll/PollPlugin.php
index 4f74e82a35..48ef15b280 100644
--- a/plugins/Poll/PollPlugin.php
+++ b/plugins/Poll/PollPlugin.php
@@ -45,7 +45,7 @@ if (!defined('STATUSNET')) {
  */
 class PollPlugin extends MicroAppPlugin
 {
-    const VERSION         = '0.1';
+    const PLUGIN_VERSION = '0.1.0';
 
     // @fixme which domain should we use for these namespaces?
     const POLL_OBJECT          = 'http://activityschema.org/object/poll';
@@ -123,7 +123,7 @@ class PollPlugin extends MicroAppPlugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'Poll',
-                            'version' => self::VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Brion Vibber',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/Poll',
                             'rawdescription' =>
diff --git a/plugins/PostDebug/PostDebugPlugin.php b/plugins/PostDebug/PostDebugPlugin.php
index 9f87494405..94c049837f 100644
--- a/plugins/PostDebug/PostDebugPlugin.php
+++ b/plugins/PostDebug/PostDebugPlugin.php
@@ -34,6 +34,8 @@ if (!defined('STATUSNET')) {
 
 class PostDebugPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     /**
      * Set to a directory to dump individual items instead of
      * sending to the debug log
@@ -51,7 +53,7 @@ class PostDebugPlugin extends Plugin
     public function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'PostDebug',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Brion Vibber',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/PostDebug',
                             'rawdescription' =>
diff --git a/plugins/PtitUrl/PtitUrlPlugin.php b/plugins/PtitUrl/PtitUrlPlugin.php
index 031604b57f..a974e914d6 100644
--- a/plugins/PtitUrl/PtitUrlPlugin.php
+++ b/plugins/PtitUrl/PtitUrlPlugin.php
@@ -33,6 +33,8 @@ if (!defined('STATUSNET')) {
 
 class PtitUrlPlugin extends UrlShortenerPlugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     public $serviceUrl;
 
     function onInitializePlugin(){
@@ -60,7 +62,7 @@ class PtitUrlPlugin extends UrlShortenerPlugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => sprintf('PtitUrl (%s)', $this->shortenerName),
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Craig Andrews',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/PtitUrl',
                             'rawdescription' =>
diff --git a/plugins/QnA/QnAPlugin.php b/plugins/QnA/QnAPlugin.php
index 6780637009..7cca3d2c7e 100644
--- a/plugins/QnA/QnAPlugin.php
+++ b/plugins/QnA/QnAPlugin.php
@@ -46,6 +46,7 @@ if (!defined('STATUSNET')) {
  */
 class QnAPlugin extends MicroAppPlugin
 {
+    const PLUGIN_VERSION = '2.0.0';
 
     var $oldSaveNew = true;
 
@@ -128,7 +129,7 @@ class QnAPlugin extends MicroAppPlugin
     {
         $versions[] = array(
             'name'        => 'QnA',
-            'version'     => GNUSOCIAL_VERSION,
+            'version'     => self::PLUGIN_VERSION,
             'author'      => 'Zach Copley',
             'homepage'    => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/QnA',
             'description' =>
diff --git a/plugins/RSSCloud/RSSCloudPlugin.php b/plugins/RSSCloud/RSSCloudPlugin.php
index 3a8a83749c..77d60551a3 100644
--- a/plugins/RSSCloud/RSSCloudPlugin.php
+++ b/plugins/RSSCloud/RSSCloudPlugin.php
@@ -31,7 +31,7 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-define('RSSCLOUDPLUGIN_VERSION', '0.1');
+define('RSSCLOUDPLUGIN_VERSION', '0.1.0');
 
 /**
  * Plugin class for adding RSSCloud capabilities to StatusNet
diff --git a/plugins/RegisterThrottle/RegisterThrottlePlugin.php b/plugins/RegisterThrottle/RegisterThrottlePlugin.php
index 5b999a4370..7d358f19df 100644
--- a/plugins/RegisterThrottle/RegisterThrottlePlugin.php
+++ b/plugins/RegisterThrottle/RegisterThrottlePlugin.php
@@ -45,6 +45,8 @@ if (!defined('GNUSOCIAL')) { exit(1); }
 
 class RegisterThrottlePlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     /**
      * Array of time spans in seconds to limits.
      *
@@ -239,7 +241,7 @@ class RegisterThrottlePlugin extends Plugin
     public function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'RegisterThrottle',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Evan Prodromou',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/RegisterThrottle',
                             'description' =>
diff --git a/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php b/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php
index 6ca13b9097..3a874fbb40 100644
--- a/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php
+++ b/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php
@@ -53,6 +53,8 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
  */
 class RequireValidatedEmailPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     /**
      * Users created before this time will be grandfathered in
      * without the validation requirement.
@@ -216,7 +218,7 @@ class RequireValidatedEmailPlugin extends Plugin
     {
         $versions[] =
           array('name' => 'Require Validated Email',
-                'version' => GNUSOCIAL_VERSION,
+                'version' => self::PLUGIN_VERSION,
                 'author' => 'Craig Andrews, '.
                 'Evan Prodromou, '.
                 'Brion Vibber',
diff --git a/plugins/ReverseUsernameAuthentication/ReverseUsernameAuthenticationPlugin.php b/plugins/ReverseUsernameAuthentication/ReverseUsernameAuthenticationPlugin.php
index 47f304414e..f8e75967e0 100644
--- a/plugins/ReverseUsernameAuthentication/ReverseUsernameAuthenticationPlugin.php
+++ b/plugins/ReverseUsernameAuthentication/ReverseUsernameAuthenticationPlugin.php
@@ -33,6 +33,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
 
 class ReverseUsernameAuthenticationPlugin extends AuthenticationPlugin
 {
+    const PLUGIN_VERSION = '2.0.0';
     //---interface implementation---//
 
     function onInitializePlugin(){
@@ -60,7 +61,7 @@ class ReverseUsernameAuthenticationPlugin extends AuthenticationPlugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'Reverse Username Authentication',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Craig Andrews',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/ReverseUsernameAuthentication',
                             'rawdescription' =>
diff --git a/plugins/SQLProfile/SQLProfilePlugin.php b/plugins/SQLProfile/SQLProfilePlugin.php
index 3baa91e494..cc3b3e6b14 100644
--- a/plugins/SQLProfile/SQLProfilePlugin.php
+++ b/plugins/SQLProfile/SQLProfilePlugin.php
@@ -29,12 +29,14 @@ if (!defined('STATUSNET')) {
  */
 class SQLProfilePlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     private $recursionGuard = false;
 
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'SQLProfile',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Brion Vibber',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/SQLProfile',
                             'rawdescription' =>
diff --git a/plugins/SQLStats/SQLStatsPlugin.php b/plugins/SQLStats/SQLStatsPlugin.php
index bd83ac0a32..3434e9362b 100644
--- a/plugins/SQLStats/SQLStatsPlugin.php
+++ b/plugins/SQLStats/SQLStatsPlugin.php
@@ -29,6 +29,8 @@ if (!defined('STATUSNET')) {
  */
 class SQLStatsPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     protected $queryCount = 0;
     protected $queryStart = 0;
     protected $queryTimes = array();
@@ -37,7 +39,7 @@ class SQLStatsPlugin extends Plugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'SQLStats',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Evan Prodromou',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/SQLStats',
                             'rawdescription' =>
diff --git a/plugins/Sample/SamplePlugin.php b/plugins/Sample/SamplePlugin.php
index 4f8351cc08..cd4d25150d 100644
--- a/plugins/Sample/SamplePlugin.php
+++ b/plugins/Sample/SamplePlugin.php
@@ -103,6 +103,8 @@ if (!defined('STATUSNET')) {
  */
 class SamplePlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     /**
      * Plugins are configured using public instance attributes. To set
      * their values, site administrators use this syntax:
@@ -225,7 +227,7 @@ class SamplePlugin extends Plugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'Sample',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Brion Vibber, Evan Prodromou',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/Sample',
                             'rawdescription' =>
diff --git a/plugins/SearchSub/SearchSubPlugin.php b/plugins/SearchSub/SearchSubPlugin.php
index 06d644235e..96e976c55c 100644
--- a/plugins/SearchSub/SearchSubPlugin.php
+++ b/plugins/SearchSub/SearchSubPlugin.php
@@ -44,7 +44,7 @@ if (!defined('STATUSNET')) {
  */
 class SearchSubPlugin extends Plugin
 {
-    const VERSION         = '0.1';
+    const PLUGIN_VERSION = '0.1.0';
 
     /**
      * Database schema setup
@@ -91,7 +91,7 @@ class SearchSubPlugin extends Plugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'SearchSub',
-                            'version' => self::VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Brion Vibber',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/SearchSub',
                             'rawdescription' =>
diff --git a/plugins/SensitiveContent/SensitiveContentPlugin.php b/plugins/SensitiveContent/SensitiveContentPlugin.php
index 8eb7c4a6ef..ce5516923b 100644
--- a/plugins/SensitiveContent/SensitiveContentPlugin.php
+++ b/plugins/SensitiveContent/SensitiveContentPlugin.php
@@ -6,12 +6,12 @@ if (!defined('GNUSOCIAL')) {
 
 class SensitiveContentPlugin extends Plugin
 {
-	const VERSION = '0.0.1';
+	const PLUGIN_VERSION = '0.0.1';
 
 	function onPluginVersion(array &$versions)
 	{
 		$versions[] = array('name' => 'Sensitive Content',
-			'version' => self::VERSION,
+			'version' => self::PLUGIN_VERSION,
 			'author' => 'MoonMan',
 			'homepage' => 'https://gitgud.io/ShitposterClub/SensitiveContent/',
 			'description' =>
diff --git a/plugins/Share/SharePlugin.php b/plugins/Share/SharePlugin.php
index 597fd652db..615cda7893 100644
--- a/plugins/Share/SharePlugin.php
+++ b/plugins/Share/SharePlugin.php
@@ -25,6 +25,8 @@ if (!defined('GNUSOCIAL')) { exit(1); }
  */
 class SharePlugin extends ActivityVerbHandlerPlugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     public function tag()
     {
         return 'share';
@@ -360,7 +362,7 @@ class SharePlugin extends ActivityVerbHandlerPlugin
     public function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'Share verb',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Mikael Nordfeldth',
                             'homepage' => 'https://gnu.io/',
                             'rawdescription' =>
diff --git a/plugins/ShareNotice/ShareNoticePlugin.php b/plugins/ShareNotice/ShareNoticePlugin.php
index fb60341e3d..af25f8a6dc 100644
--- a/plugins/ShareNotice/ShareNoticePlugin.php
+++ b/plugins/ShareNotice/ShareNoticePlugin.php
@@ -26,6 +26,8 @@ if (!defined('STATUSNET')) { exit(1); }
 
 class ShareNoticePlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     public $targets = array(
         array('Twitter'),
         array('Facebook'),
@@ -214,7 +216,7 @@ class FacebookShareTarget extends NoticeShareTarget
         $url = 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/ShareNotice';
 
         $versions[] = array('name' => 'ShareNotice',
-            'version' => GNUSOCIAL_VERSION,
+            'version' => self::PLUGIN_VERSION,
             'author' => 'Brion Vibber',
             'homepage' => $url,
             'rawdescription' =>
diff --git a/plugins/SimpleCaptcha/SimpleCaptchaPlugin.php b/plugins/SimpleCaptcha/SimpleCaptchaPlugin.php
index 5f5cd204f2..f75beaa12f 100644
--- a/plugins/SimpleCaptcha/SimpleCaptchaPlugin.php
+++ b/plugins/SimpleCaptcha/SimpleCaptchaPlugin.php
@@ -25,6 +25,8 @@ if (!defined('GNUSOCIAL')) { exit(1); }
  */
 class SimpleCaptchaPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     public function initialize()
     {
         // This probably needs some work. For example with IPv6 you can easily generate new IPs...
@@ -62,7 +64,7 @@ class SimpleCaptchaPlugin extends Plugin
     public function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'Simple Captcha',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Mikael Nordfeldth',
                             'homepage' => 'https://gnu.io/social',
                             'rawdescription' =>
diff --git a/plugins/SimpleUrl/SimpleUrlPlugin.php b/plugins/SimpleUrl/SimpleUrlPlugin.php
index 235a330e02..65398a86e8 100644
--- a/plugins/SimpleUrl/SimpleUrlPlugin.php
+++ b/plugins/SimpleUrl/SimpleUrlPlugin.php
@@ -33,6 +33,8 @@ if (!defined('STATUSNET')) {
 
 class SimpleUrlPlugin extends UrlShortenerPlugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     public $serviceUrl;
 
     function onInitializePlugin(){
@@ -50,7 +52,7 @@ class SimpleUrlPlugin extends UrlShortenerPlugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => sprintf('SimpleUrl (%s)', $this->shortenerName),
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Craig Andrews',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/SimpleUrl',
                             'rawdescription' =>
diff --git a/plugins/Sitemap/SitemapPlugin.php b/plugins/Sitemap/SitemapPlugin.php
index 75c36cf0dd..c4c34eccc9 100644
--- a/plugins/Sitemap/SitemapPlugin.php
+++ b/plugins/Sitemap/SitemapPlugin.php
@@ -46,6 +46,8 @@ if (!defined('STATUSNET')) {
  */
 class SitemapPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     const USERS_PER_MAP   = 50000;
     const NOTICES_PER_MAP = 50000;
 
@@ -178,7 +180,7 @@ class SitemapPlugin extends Plugin
         $url = 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/Sitemap';
 
         $versions[] = array('name' => 'Sitemap',
-            'version' => GNUSOCIAL_VERSION,
+            'version' => self::PLUGIN_VERSION,
             'author' => 'Evan Prodromou',
             'homepage' => $url,
             'rawdescription' =>
diff --git a/plugins/SlicedFavorites/SlicedFavoritesPlugin.php b/plugins/SlicedFavorites/SlicedFavoritesPlugin.php
index fcf971de6a..8048bb1f02 100644
--- a/plugins/SlicedFavorites/SlicedFavoritesPlugin.php
+++ b/plugins/SlicedFavorites/SlicedFavoritesPlugin.php
@@ -26,6 +26,8 @@ if (!defined('STATUSNET')) { exit(1); }
 
 class SlicedFavoritesPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     /**
      * Example:
      *
@@ -100,7 +102,7 @@ class SlicedFavoritesPlugin extends Plugin
         $url = 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/SlicedFavorites';
 
         $versions[] = array('name' => 'SlicedFavorites',
-            'version' => GNUSOCIAL_VERSION,
+            'version' => self::PLUGIN_VERSION,
             'author' => 'Brion Vibber',
             'homepage' => $url,
             'rawdescription' =>
diff --git a/plugins/SphinxSearch/SphinxSearchPlugin.php b/plugins/SphinxSearch/SphinxSearchPlugin.php
index 8345ea59e7..c19fa6a3bf 100644
--- a/plugins/SphinxSearch/SphinxSearchPlugin.php
+++ b/plugins/SphinxSearch/SphinxSearchPlugin.php
@@ -53,6 +53,8 @@ foreach($sphinxDefaults as $key => $val) {
  */
 class SphinxSearchPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     /**
      * Automatically load any classes used
      *
@@ -110,7 +112,7 @@ class SphinxSearchPlugin extends Plugin
         $url = 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/SphinxSearch';
 
         $versions[] = array('name' => 'SphinxSearch',
-            'version' => GNUSOCIAL_VERSION,
+            'version' => self::PLUGIN_VERSION,
             'author' => 'Brion Vibber',
             'homepage' => $url,
             'rawdescription' =>
diff --git a/plugins/StoreRemoteMedia/StoreRemoteMediaPlugin.php b/plugins/StoreRemoteMedia/StoreRemoteMediaPlugin.php
index e171218f79..89635db8b8 100644
--- a/plugins/StoreRemoteMedia/StoreRemoteMediaPlugin.php
+++ b/plugins/StoreRemoteMedia/StoreRemoteMediaPlugin.php
@@ -6,6 +6,8 @@ if (!defined('GNUSOCIAL')) { exit(1); }
 
 class StoreRemoteMediaPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     // settings which can be set in config.php with addPlugin('Oembed', array('param'=>'value', ...));
     // WARNING, these are _regexps_ (slashes added later). Always escape your dots and end your strings
     public $domain_whitelist = array(       // hostname => service provider
@@ -201,7 +203,7 @@ class StoreRemoteMediaPlugin extends Plugin
     public function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'StoreRemoteMedia',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Mikael Nordfeldth',
                             'homepage' => 'https://gnu.io/',
                             'description' =>
diff --git a/plugins/StrictTransportSecurity/StrictTransportSecurityPlugin.php b/plugins/StrictTransportSecurity/StrictTransportSecurityPlugin.php
index e3c879943e..07047c2778 100644
--- a/plugins/StrictTransportSecurity/StrictTransportSecurityPlugin.php
+++ b/plugins/StrictTransportSecurity/StrictTransportSecurityPlugin.php
@@ -31,6 +31,8 @@ if (!defined('GNUSOCIAL')) { exit(1); }
 
 class StrictTransportSecurityPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     public $max_age = 15552000;
     public $includeSubDomains = false;
     public $preloadToken = false;
@@ -53,7 +55,7 @@ class StrictTransportSecurityPlugin extends Plugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'StrictTransportSecurity',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Craig Andrews',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/StrictTransportSecurity',
                             'rawdescription' =>
diff --git a/plugins/SubMirror/SubMirrorPlugin.php b/plugins/SubMirror/SubMirrorPlugin.php
index 83e15a9bd4..b4c1dac519 100644
--- a/plugins/SubMirror/SubMirrorPlugin.php
+++ b/plugins/SubMirror/SubMirrorPlugin.php
@@ -25,6 +25,8 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
  */
 class SubMirrorPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     /**
      * Hook for RouterInitialized event.
      *
@@ -60,7 +62,7 @@ class SubMirrorPlugin extends Plugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'SubMirror',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Brion Vibber',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/SubMirror',
                             'rawdescription' =>
diff --git a/plugins/SubscriptionThrottle/SubscriptionThrottlePlugin.php b/plugins/SubscriptionThrottle/SubscriptionThrottlePlugin.php
index 30b9290273..256e3dc1c6 100644
--- a/plugins/SubscriptionThrottle/SubscriptionThrottlePlugin.php
+++ b/plugins/SubscriptionThrottle/SubscriptionThrottlePlugin.php
@@ -46,6 +46,8 @@ if (!defined('STATUSNET')) {
  */
 class SubscriptionThrottlePlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     public $subLimits = array(86400 => 100,
                               3600 => 50);
 
@@ -160,7 +162,7 @@ class SubscriptionThrottlePlugin extends Plugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'SubscriptionThrottle',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Evan Prodromou',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/SubscriptionThrottle',
                             'rawdescription' =>
diff --git a/plugins/TabFocus/TabFocusPlugin.php b/plugins/TabFocus/TabFocusPlugin.php
index ff43613383..b75e3a85a3 100644
--- a/plugins/TabFocus/TabFocusPlugin.php
+++ b/plugins/TabFocus/TabFocusPlugin.php
@@ -34,6 +34,8 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
 
 class TabFocusPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     function __construct()
     {
         parent::__construct();
@@ -47,7 +49,7 @@ class TabFocusPlugin extends Plugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'TabFocus',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Craig Andrews and Paul Irish',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/TabFocus',
                             'rawdescription' =>
diff --git a/plugins/TagCloud/TagCloudPlugin.php b/plugins/TagCloud/TagCloudPlugin.php
index c616be75fd..e47d697839 100644
--- a/plugins/TagCloud/TagCloudPlugin.php
+++ b/plugins/TagCloud/TagCloudPlugin.php
@@ -13,6 +13,7 @@
 if (!defined('GNUSOCIAL')) { exit(1); }
 
 class TagCloudPlugin extends Plugin {
+    const PLUGIN_VERSION = '2.0.0';
 
     public function onRouterInitialized(URLMapper $m)
     {
@@ -59,7 +60,7 @@ class TagCloudPlugin extends Plugin {
     public function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'TagCloud',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Mikael Nordfeldth',
                             'homepage' => 'https://gnu.io/social',
                             'description' =>
diff --git a/plugins/TagSub/TagSubPlugin.php b/plugins/TagSub/TagSubPlugin.php
index 14c0cd191b..eaefa058f2 100644
--- a/plugins/TagSub/TagSubPlugin.php
+++ b/plugins/TagSub/TagSubPlugin.php
@@ -44,7 +44,7 @@ if (!defined('STATUSNET')) {
  */
 class TagSubPlugin extends Plugin
 {
-    const VERSION         = '0.1';
+    const PLUGIN_VERSION = '0.1.0';
 
     /**
      * Database schema setup
@@ -92,7 +92,7 @@ class TagSubPlugin extends Plugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'TagSub',
-                            'version' => self::VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Brion Vibber',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/TagSub',
                             'rawdescription' =>
diff --git a/plugins/TightUrl/TightUrlPlugin.php b/plugins/TightUrl/TightUrlPlugin.php
index a3bc492ad1..3134c730aa 100644
--- a/plugins/TightUrl/TightUrlPlugin.php
+++ b/plugins/TightUrl/TightUrlPlugin.php
@@ -33,6 +33,8 @@ if (!defined('STATUSNET')) {
 
 class TightUrlPlugin extends UrlShortenerPlugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     public $serviceUrl;
 
     function onInitializePlugin(){
@@ -60,7 +62,7 @@ class TightUrlPlugin extends UrlShortenerPlugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => sprintf('TightUrl (%s)', $this->shortenerName),
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Craig Andrews',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/TightUrl',
                             'rawdescription' =>
diff --git a/plugins/TwitterBridge/TwitterBridgePlugin.php b/plugins/TwitterBridge/TwitterBridgePlugin.php
index 5bf63a3946..b67c996e1d 100644
--- a/plugins/TwitterBridge/TwitterBridgePlugin.php
+++ b/plugins/TwitterBridge/TwitterBridgePlugin.php
@@ -47,7 +47,7 @@ require_once __DIR__ . '/twitter.php';
  */
 class TwitterBridgePlugin extends Plugin
 {
-    const VERSION = GNUSOCIAL_VERSION;
+    const PLUGIN_VERSION = '2.0.0';
     public $adminImportControl = false; // Should the 'import' checkbox be exposed in the admin panel?
 
     /**
@@ -299,7 +299,7 @@ class TwitterBridgePlugin extends Plugin
     {
         $versions[] = array(
             'name' => 'TwitterBridge',
-            'version' => self::VERSION,
+            'version' => self::PLUGIN_VERSION,
             'author' => 'Zach Copley, Julien C, Jean Baptiste Favre',
             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/TwitterBridge',
             // TRANS: Plugin description.
diff --git a/plugins/UserFlag/UserFlagPlugin.php b/plugins/UserFlag/UserFlagPlugin.php
index 8b2971f35e..ed1b281fce 100644
--- a/plugins/UserFlag/UserFlagPlugin.php
+++ b/plugins/UserFlag/UserFlagPlugin.php
@@ -42,6 +42,8 @@ if (!defined('STATUSNET')) {
  */
 class UserFlagPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     const REVIEWFLAGS = 'UserFlagPlugin::reviewflags';
     const CLEARFLAGS  = 'UserFlagPlugin::clearflags';
 
@@ -232,7 +234,7 @@ class UserFlagPlugin extends Plugin
         $url = 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/UserFlag';
 
         $versions[] = array('name' => 'UserFlag',
-            'version' => GNUSOCIAL_VERSION,
+            'version' => self::PLUGIN_VERSION,
             'author' => 'Evan Prodromou',
             'homepage' => $url,
             'rawdescription' =>
diff --git a/plugins/UserLimit/UserLimitPlugin.php b/plugins/UserLimit/UserLimitPlugin.php
index 2bb1218a72..b3629af051 100644
--- a/plugins/UserLimit/UserLimitPlugin.php
+++ b/plugins/UserLimit/UserLimitPlugin.php
@@ -47,6 +47,8 @@ if (!defined('STATUSNET')) {
  */
 class UserLimitPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     public $maxUsers = null;
 
     public function onStartUserRegister(Profile $profile)
@@ -84,7 +86,7 @@ class UserLimitPlugin extends Plugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'UserLimit',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Evan Prodromou',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/UserLimit',
                             'description' =>
diff --git a/plugins/VideoThumbnails/VideoThumbnailsPlugin.php b/plugins/VideoThumbnails/VideoThumbnailsPlugin.php
index 5b96653db1..1ca49410f1 100644
--- a/plugins/VideoThumbnails/VideoThumbnailsPlugin.php
+++ b/plugins/VideoThumbnails/VideoThumbnailsPlugin.php
@@ -42,6 +42,8 @@ if (!defined('GNUSOCIAL')) { exit(1); }
 
 class VideoThumbnailsPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     /*
      * This function should only extract an image from the video stream
      * and disregard any cropping or scaling in the resulting file, as
@@ -99,7 +101,7 @@ class VideoThumbnailsPlugin extends Plugin
     public function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'Video Thumbnails',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Mikael Nordfeldth',
                             'homepage' => 'https://www.gnu.org/software/social/',
                             'rawdescription' =>
diff --git a/plugins/WebFinger/WebFingerPlugin.php b/plugins/WebFinger/WebFingerPlugin.php
index d8ddcb1ce2..938fd8446a 100644
--- a/plugins/WebFinger/WebFingerPlugin.php
+++ b/plugins/WebFinger/WebFingerPlugin.php
@@ -31,6 +31,8 @@ if (!defined('GNUSOCIAL')) { exit(1); }
 
 class WebFingerPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     const OAUTH_ACCESS_TOKEN_REL    = 'http://apinamespace.org/oauth/access_token';
     const OAUTH_REQUEST_TOKEN_REL   = 'http://apinamespace.org/oauth/request_token';
     const OAUTH_AUTHORIZE_REL       = 'http://apinamespace.org/oauth/authorize';
@@ -221,7 +223,7 @@ class WebFingerPlugin extends Plugin
     public function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'WebFinger',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Mikael Nordfeldth',
                             'homepage' => 'http://www.gnu.org/software/social/',
                             // TRANS: Plugin description.
diff --git a/plugins/WikiHashtags/WikiHashtagsPlugin.php b/plugins/WikiHashtags/WikiHashtagsPlugin.php
index 46d0470143..0d0ff2417a 100644
--- a/plugins/WikiHashtags/WikiHashtagsPlugin.php
+++ b/plugins/WikiHashtags/WikiHashtagsPlugin.php
@@ -44,7 +44,7 @@ if (!defined('STATUSNET')) {
  */
 class WikiHashtagsPlugin extends Plugin
 {
-    const VERSION = '0.1';
+    const PLUGIN_VERSION = '0.1.0';
 
     function __construct($code=null)
     {
@@ -107,7 +107,7 @@ class WikiHashtagsPlugin extends Plugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'WikiHashtags',
-                            'version' => self::VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Evan Prodromou',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/WikiHashtags',
                             'rawdescription' =>
diff --git a/plugins/WikiHowProfile/WikiHowProfilePlugin.php b/plugins/WikiHowProfile/WikiHowProfilePlugin.php
index 9d8daf8adb..a628a6ccee 100644
--- a/plugins/WikiHowProfile/WikiHowProfilePlugin.php
+++ b/plugins/WikiHowProfile/WikiHowProfilePlugin.php
@@ -49,10 +49,12 @@ if (!defined('STATUSNET')) {
  */
 class WikiHowProfilePlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'WikiHow avatar fetcher',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Brion Vibber',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/Sample',
                             'rawdescription' =>
diff --git a/plugins/Xmpp/XmppPlugin.php b/plugins/Xmpp/XmppPlugin.php
index 87bda488e9..14914a2609 100644
--- a/plugins/Xmpp/XmppPlugin.php
+++ b/plugins/Xmpp/XmppPlugin.php
@@ -46,6 +46,8 @@ if (!defined('STATUSNET')) {
  */
 class XmppPlugin extends ImPlugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     public $server = null;
     public $port = 5222;
     public $user = 'update';
@@ -441,7 +443,7 @@ class XmppPlugin extends ImPlugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'XMPP',
-            'version' => GNUSOCIAL_VERSION,
+            'version' => self::PLUGIN_VERSION,
             'author' => 'Craig Andrews, Evan Prodromou',
             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/XMPP',
             'rawdescription' =>