diff --git a/HISTORY b/HISTORY
index 469aa94f..393c7395 100644
--- a/HISTORY
+++ b/HISTORY
@@ -7774,9 +7774,11 @@ Video Disk Recorder Revision History
 - Updated the default channels.conf file.
 
 
-2013-03-29: Version 2.0.0
+2013-03-31: Version 2.0.0
 
 - Updated the Lithuanian OSD texts (thanks to Valdemaras Pipiras).
 - Fixed the description of the 'M' parameter of channel definitions in vdr.5.
 - Updated the French OSD texts (thanks to Dominique Plu).
 - Fixed handling overlapping pending timers (reported by Matthias Senzel).
+- Bumped all version numbers to 2.0.0.
+- Official release.
diff --git a/PLUGINS/src/dvbsddevice/HISTORY b/PLUGINS/src/dvbsddevice/HISTORY
index e1f98548..4dd75d2c 100644
--- a/PLUGINS/src/dvbsddevice/HISTORY
+++ b/PLUGINS/src/dvbsddevice/HISTORY
@@ -41,3 +41,7 @@ VDR Plugin 'dvbsddevice' Revision History
 2013-01-25: Version 0.0.9
 
 - Returning 0 from cDvbSdFfDevice::NumProvidedSystems() if option --outputonly is given.
+
+2013-03-31: Version 2.0.0
+
+- Official release.
diff --git a/PLUGINS/src/dvbsddevice/dvbsddevice.c b/PLUGINS/src/dvbsddevice/dvbsddevice.c
index 8ebfe2b6..cdc07836 100644
--- a/PLUGINS/src/dvbsddevice/dvbsddevice.c
+++ b/PLUGINS/src/dvbsddevice/dvbsddevice.c
@@ -3,14 +3,14 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: dvbsddevice.c 1.9 2013/01/25 10:48:50 kls Exp $
+ * $Id: dvbsddevice.c 1.10 2013/03/31 09:30:18 kls Exp $
  */
 
 #include <getopt.h>
 #include <vdr/plugin.h>
 #include "dvbsdffdevice.h"
 
-static const char *VERSION        = "0.0.9";
+static const char *VERSION        = "2.0.0";
 static const char *DESCRIPTION    = "SD Full Featured DVB device";
 
 class cPluginDvbsddevice : public cPlugin {
diff --git a/PLUGINS/src/epgtableid0/HISTORY b/PLUGINS/src/epgtableid0/HISTORY
index 5712e241..da97932a 100644
--- a/PLUGINS/src/epgtableid0/HISTORY
+++ b/PLUGINS/src/epgtableid0/HISTORY
@@ -12,3 +12,7 @@ VDR Plugin 'epgtableid0' Revision History
 2013-01-12: Version 0.0.3
 
 - Adapted Makefile to changes introduced in recent VDR versions.
+
+2013-03-31: Version 2.0.0
+
+- Official release.
diff --git a/PLUGINS/src/epgtableid0/epgtableid0.c b/PLUGINS/src/epgtableid0/epgtableid0.c
index 95149093..1aef2a7a 100644
--- a/PLUGINS/src/epgtableid0/epgtableid0.c
+++ b/PLUGINS/src/epgtableid0/epgtableid0.c
@@ -3,13 +3,13 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: epgtableid0.c 1.3 2013/01/12 14:12:13 kls Exp $
+ * $Id: epgtableid0.c 1.4 2013/03/31 09:30:18 kls Exp $
  */
 
 #include <vdr/epg.h>
 #include <vdr/plugin.h>
 
-static const char *VERSION        = "0.0.3";
+static const char *VERSION        = "2.0.0";
 static const char *DESCRIPTION    = "EPG handler for events with table id 0x00";
 
 // --- cTable0Handler --------------------------------------------------------
diff --git a/PLUGINS/src/hello/HISTORY b/PLUGINS/src/hello/HISTORY
index cb797184..250f36a5 100644
--- a/PLUGINS/src/hello/HISTORY
+++ b/PLUGINS/src/hello/HISTORY
@@ -82,3 +82,7 @@ VDR Plugin 'hello' Revision History
 2013-01-12: Version 0.2.7
 
 - Adapted Makefile to changes introduced in recent VDR versions.
+
+2013-03-31: Version 2.0.0
+
+- Official release.
diff --git a/PLUGINS/src/hello/hello.c b/PLUGINS/src/hello/hello.c
index f7777bec..21f93836 100644
--- a/PLUGINS/src/hello/hello.c
+++ b/PLUGINS/src/hello/hello.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: hello.c 2.5 2013/01/12 14:12:18 kls Exp $
+ * $Id: hello.c 2.6 2013/03/31 09:30:18 kls Exp $
  */
 
 #include <getopt.h>
@@ -12,7 +12,7 @@
 #include <vdr/interface.h>
 #include <vdr/plugin.h>
 
-static const char *VERSION        = "0.2.7";
+static const char *VERSION        = "2.0.0";
 static const char *DESCRIPTION    = trNOOP("A friendly greeting");
 static const char *MAINMENUENTRY  = trNOOP("Hello");
 
diff --git a/PLUGINS/src/osddemo/HISTORY b/PLUGINS/src/osddemo/HISTORY
index 56ccbb8a..b1411de1 100644
--- a/PLUGINS/src/osddemo/HISTORY
+++ b/PLUGINS/src/osddemo/HISTORY
@@ -55,3 +55,7 @@ VDR Plugin 'osddemo' Revision History
 2013-02-19: Version 0.3.1
 
 - The demos can now also be ended with the "Back" key.
+
+2013-03-31: Version 2.0.0
+
+- Official release.
diff --git a/PLUGINS/src/osddemo/osddemo.c b/PLUGINS/src/osddemo/osddemo.c
index 7a36f42c..f88f7766 100644
--- a/PLUGINS/src/osddemo/osddemo.c
+++ b/PLUGINS/src/osddemo/osddemo.c
@@ -3,13 +3,13 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: osddemo.c 2.11 2013/02/19 12:43:19 kls Exp $
+ * $Id: osddemo.c 2.12 2013/03/31 09:30:18 kls Exp $
  */
 
 #include <vdr/osd.h>
 #include <vdr/plugin.h>
 
-static const char *VERSION        = "0.3.1";
+static const char *VERSION        = "2.0.0";
 static const char *DESCRIPTION    = "Demo of arbitrary OSD setup";
 static const char *MAINMENUENTRY  = "Osd Demo";
 
diff --git a/PLUGINS/src/pictures/HISTORY b/PLUGINS/src/pictures/HISTORY
index 12442688..7308927e 100644
--- a/PLUGINS/src/pictures/HISTORY
+++ b/PLUGINS/src/pictures/HISTORY
@@ -83,3 +83,7 @@ VDR Plugin 'pictures' Revision History
 2013-01-12: Version 0.1.5
 
 - Adapted Makefile to changes introduced in recent VDR versions.
+
+2013-03-31: Version 2.0.0
+
+- Official release.
diff --git a/PLUGINS/src/pictures/pictures.c b/PLUGINS/src/pictures/pictures.c
index c73e5981..7a46a5f3 100644
--- a/PLUGINS/src/pictures/pictures.c
+++ b/PLUGINS/src/pictures/pictures.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: pictures.c 2.8 2013/01/12 14:12:42 kls Exp $
+ * $Id: pictures.c 2.9 2013/03/31 09:30:18 kls Exp $
  */
 
 #include <getopt.h>
@@ -11,7 +11,7 @@
 #include "menu.h"
 #include "player.h"
 
-static const char *VERSION       = "0.1.5";
+static const char *VERSION       = "2.0.0";
 static const char *DESCRIPTION   = trNOOP("A simple picture viewer");
 static const char *MAINMENUENTRY = trNOOP("Pictures");
 
diff --git a/PLUGINS/src/rcu/HISTORY b/PLUGINS/src/rcu/HISTORY
index 6d2d63e0..b9043bbf 100644
--- a/PLUGINS/src/rcu/HISTORY
+++ b/PLUGINS/src/rcu/HISTORY
@@ -16,3 +16,7 @@ VDR Plugin 'rcu' Revision History
 2013-01-12: Version 0.0.4
 
 - Adapted Makefile to changes introduced in recent VDR versions.
+
+2013-03-31: Version 2.0.0
+
+- Official release.
diff --git a/PLUGINS/src/rcu/rcu.c b/PLUGINS/src/rcu/rcu.c
index a1b4538d..17b538a2 100644
--- a/PLUGINS/src/rcu/rcu.c
+++ b/PLUGINS/src/rcu/rcu.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: rcu.c 1.4 2013/01/12 14:12:54 kls Exp $
+ * $Id: rcu.c 1.5 2013/03/31 09:30:18 kls Exp $
  */
 
 #include <getopt.h>
@@ -16,7 +16,7 @@
 #include <vdr/thread.h>
 #include <vdr/tools.h>
 
-static const char *VERSION        = "0.0.4";
+static const char *VERSION        = "2.0.0";
 static const char *DESCRIPTION    = "Remote Control Unit";
 
 #define REPEATLIMIT      150 // ms
diff --git a/PLUGINS/src/servicedemo/HISTORY b/PLUGINS/src/servicedemo/HISTORY
index 11c9c45c..b1c74804 100644
--- a/PLUGINS/src/servicedemo/HISTORY
+++ b/PLUGINS/src/servicedemo/HISTORY
@@ -17,3 +17,7 @@ VDR Plugin 'servicedemo' Revision History
 2013-01-12: Version 0.1.4
 
 - Adapted Makefile to changes introduced in recent VDR versions.
+
+2013-03-31: Version 2.0.0
+
+- Official release.
diff --git a/PLUGINS/src/servicedemo/svccli.c b/PLUGINS/src/servicedemo/svccli.c
index d8b8e162..eb671acc 100644
--- a/PLUGINS/src/servicedemo/svccli.c
+++ b/PLUGINS/src/servicedemo/svccli.c
@@ -3,14 +3,14 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: svccli.c 2.3 2013/02/17 14:10:26 kls Exp $
+ * $Id: svccli.c 2.4 2013/03/31 09:30:18 kls Exp $
  */
 
 #include <stdlib.h>
 #include <vdr/interface.h>
 #include <vdr/plugin.h>
 
-static const char *VERSION        = "0.1.4";
+static const char *VERSION        = "2.0.0";
 static const char *DESCRIPTION    = "Service demo client";
 static const char *MAINMENUENTRY  = "Service demo";
 
diff --git a/PLUGINS/src/servicedemo/svcsvr.c b/PLUGINS/src/servicedemo/svcsvr.c
index 55d1bc01..252a4a2c 100644
--- a/PLUGINS/src/servicedemo/svcsvr.c
+++ b/PLUGINS/src/servicedemo/svcsvr.c
@@ -3,14 +3,14 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: svcsvr.c 2.3 2013/02/17 14:10:38 kls Exp $
+ * $Id: svcsvr.c 2.4 2013/03/31 09:30:18 kls Exp $
  */
 
 #include <stdlib.h>
 #include <vdr/interface.h>
 #include <vdr/plugin.h>
 
-static const char *VERSION        = "0.1.4";
+static const char *VERSION        = "2.0.0";
 static const char *DESCRIPTION    = "Service demo server";
 
 class cPluginSvcSvr : public cPlugin {
diff --git a/PLUGINS/src/skincurses/HISTORY b/PLUGINS/src/skincurses/HISTORY
index 53e70e81..63595076 100644
--- a/PLUGINS/src/skincurses/HISTORY
+++ b/PLUGINS/src/skincurses/HISTORY
@@ -114,3 +114,7 @@ VDR Plugin 'skincurses' Revision History
 
 - The "Recording info" page now displays the name of the channel (if available)
   from which this recording was taken.
+
+2013-03-31: Version 2.0.0
+
+- Official release.
diff --git a/PLUGINS/src/skincurses/skincurses.c b/PLUGINS/src/skincurses/skincurses.c
index da9d17ae..8a4da965 100644
--- a/PLUGINS/src/skincurses/skincurses.c
+++ b/PLUGINS/src/skincurses/skincurses.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: skincurses.c 2.12 2013/03/03 15:33:59 kls Exp $
+ * $Id: skincurses.c 2.13 2013/03/31 09:30:18 kls Exp $
  */
 
 #include <ncurses.h>
@@ -12,7 +12,7 @@
 #include <vdr/skins.h>
 #include <vdr/videodir.h>
 
-static const char *VERSION        = "0.1.15";
+static const char *VERSION        = "2.0.0";
 static const char *DESCRIPTION    = trNOOP("A text only skin");
 static const char *MAINMENUENTRY  = NULL;
 
diff --git a/PLUGINS/src/status/HISTORY b/PLUGINS/src/status/HISTORY
index 4056762c..bbf2c69b 100644
--- a/PLUGINS/src/status/HISTORY
+++ b/PLUGINS/src/status/HISTORY
@@ -56,3 +56,7 @@ VDR Plugin 'status' Revision History
 2013-01-12: Version 0.3.3
 
 - Adapted Makefile to changes introduced in recent VDR versions.
+
+2013-03-31: Version 2.0.0
+
+- Official release.
diff --git a/PLUGINS/src/status/status.c b/PLUGINS/src/status/status.c
index 4f7b0518..e9e3ae7d 100644
--- a/PLUGINS/src/status/status.c
+++ b/PLUGINS/src/status/status.c
@@ -3,13 +3,13 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: status.c 2.3 2013/01/12 14:13:17 kls Exp $
+ * $Id: status.c 2.4 2013/03/31 09:30:18 kls Exp $
  */
 
 #include <vdr/plugin.h>
 #include <vdr/status.h>
 
-static const char *VERSION        = "0.3.3";
+static const char *VERSION        = "2.0.0";
 static const char *DESCRIPTION    = "Status monitor test";
 static const char *MAINMENUENTRY  = NULL;
 
diff --git a/PLUGINS/src/svdrpdemo/HISTORY b/PLUGINS/src/svdrpdemo/HISTORY
index bf69eecf..c6f03959 100644
--- a/PLUGINS/src/svdrpdemo/HISTORY
+++ b/PLUGINS/src/svdrpdemo/HISTORY
@@ -21,3 +21,7 @@ VDR Plugin 'svdrpdemo' Revision History
 2013-01-12: Version 0.0.5
 
 - Adapted Makefile to changes introduced in recent VDR versions.
+
+2013-03-31: Version 2.0.0
+
+- Official release.
diff --git a/PLUGINS/src/svdrpdemo/svdrpdemo.c b/PLUGINS/src/svdrpdemo/svdrpdemo.c
index 1a0032ef..a1a27663 100644
--- a/PLUGINS/src/svdrpdemo/svdrpdemo.c
+++ b/PLUGINS/src/svdrpdemo/svdrpdemo.c
@@ -3,12 +3,12 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: svdrpdemo.c 2.2 2013/01/12 14:13:28 kls Exp $
+ * $Id: svdrpdemo.c 2.3 2013/03/31 09:30:18 kls Exp $
  */
 
 #include <vdr/plugin.h>
 
-static const char *VERSION        = "0.0.5";
+static const char *VERSION        = "2.0.0";
 static const char *DESCRIPTION    = "How to add SVDRP support to a plugin";
 
 class cPluginSvdrpdemo : public cPlugin {
diff --git a/config.h b/config.h
index b55498ff..6a8e5d36 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 2.75 2013/03/16 15:12:14 kls Exp $
+ * $Id: config.h 2.76 2013/03/31 09:30:18 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,13 +22,13 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.7.42"
-#define VDRVERSNUM   10742  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "2.0.0"
+#define VDRVERSNUM   20000  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
-#define APIVERSION  "1.7.41"
-#define APIVERSNUM   10741  // Version * 10000 + Major * 100 + Minor
+#define APIVERSION  "2.0.0"
+#define APIVERSNUM   20000  // Version * 10000 + Major * 100 + Minor
 
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to