diff --git a/gateway.notes b/gateway.notes
index 41c19a5..3c4b7e5 100644
--- a/gateway.notes
+++ b/gateway.notes
@@ -126,3 +126,9 @@ Fri Jan 30 16:25:29 CET 2015   Gateway2-0-6-0   Ralph Lange
     Add Jenkins job for CloudBees CI.
     Fix crashes when forwarding empty arrays (bug lp:1415938).
     Use variable length arrays for CAC (IOC side) subscriptions.
+
+Wed May 11 16:00:52 CEST 2016   Gateway 2.1.0   Ralph Lange
+    Full support for DBE_PROPERTY event flag.
+    Add unit test framework (as embedded TOP).
+    And tests for event flag support, including DBE_PROPERTY.
+    Fix many small bugs and compiler warnings.
diff --git a/src/gateVersion.h b/src/gateVersion.h
index fa1dd87..c4bbd24 100644
--- a/src/gateVersion.h
+++ b/src/gateVersion.h
@@ -27,9 +27,9 @@
 #define GATEWAY_VERSION       2
 #define GATEWAY_REVISION      1
 #define GATEWAY_MODIFICATION  0
-#define GATEWAY_UPDATE_LEVEL  DEV
+#define GATEWAY_UPDATE_LEVEL  0
 
-#define GATEWAY_VERSION_STRING "PV Gateway Version 2.1.0.DEV"
+#define GATEWAY_VERSION_STRING "PV Gateway Version 2.1.0"
 
 #define GATEWAY_CREDITS_STRING  \
           "Originally developed at Argonne National Laboratory and BESSY\n\n" \