From 8244370bfb69f6fb5a989e562d78c155948ef702 Mon Sep 17 00:00:00 2001
From: Bernhard Miklautz <bernhard.miklautz@thincast.com>
Date: Tue, 28 Nov 2017 15:03:09 +0100
Subject: [PATCH] Version 2.0.0-rc1

---
 CMakeLists.txt |  2 +-
 ChangeLog      | 43 +++++++++++++++++++++++++++++++++++++++++++
 README         |  6 ++----
 3 files changed, 46 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 671592bd1..762e37245 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -76,7 +76,7 @@ if ($ENV{BUILD_NUMBER})
 endif()
 set(WITH_LIBRARY_VERSIONING "ON")
 
-set(RAW_VERSTION_STRING "2.0.0-dev")
+set(RAW_VERSTION_STRING "2.0.0-rc1")
 if(EXISTS "${CMAKE_SOURCE_DIR}/.source_tag")
 	file(READ ${CMAKE_SOURCE_DIR}/.source_tag RAW_VERSTION_STRING)
 elseif(USE_VERSION_FROM_GIT_TAG)
diff --git a/ChangeLog b/ChangeLog
index 614926172..622aaf693 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,46 @@
+2017-11-28	Version 2.0.0-rc1
+
+FreeRDP 2.0.0-rc1 is the second release candidate for 2.0.0.
+For a complete and detailed change log since the last release candidate run:
+git log 2.0.0-rc0..master
+
+Noteworthy features and improvements:
+
+* support for FIPS mode was added (option +fipsmode)
+* initial client side kerberos support (run cmake with WITH_GSSAPI)
+* support for ssh-agent redirection (as rdp channel)
+* the man page(s) and /help were updated an improved
+* build: support for GNU/kFreeBSD
+* add support for ICU for unicode conversion (-DWITH_ICU=ON)
+* client add option to force password prompt before connection (/from-stdin[:force])
+* add Samsung DeX support
+* extend /size to allow width or height percentages (#4146)
+* add support for "password is pin"
+* clipboard is now enabled per default (use -clipboard to disable)
+
+Fixed github issues (excerpt):
+
+* #4281: Added option to prefer IPv6 over IPv4
+* #3890: Point to OpenSSL doc for private CA
+* #3378: support 31 static channels as described in the spec
+* #1536: fix clipboard on mac
+* #4253: Rfx decode tile width.
+* #3267: fix parsing of drivestoredirect
+* #4257: Proper error checks for /kbd argument
+* #4249: Corruption due to recursive parser
+* #4111: 15bpp color handling for brush.
+* #3509: Added Ctrl+Alt+Enter description
+* #3211: Return freerdp error from main.
+* #3513: add better description for drive redirection
+* #4199: ConvertFindDataAToW string length
+* #4135: client/x11: fix colors on big endian
+* #4089: fix h264 context leak when DeleteSurface
+* #4117: possible segfault
+* #4091: fix a regression with remote program
+
+See https://github.com/FreeRDP/FreeRDP/milestone/7 for a complete list.
+
+
 2012-02-07	Version 1.0.1
 
 FreeRDP 1.0.1 is a maintenance release to address a certain number of
diff --git a/README b/README
index f40c20c56..0144d8706 100644
--- a/README
+++ b/README
@@ -11,9 +11,9 @@ Resources
 Project website: http://www.freerdp.com/
 Issue tracker: https://github.com/FreeRDP/FreeRDP/issues
 Sources: https://github.com/FreeRDP/FreeRDP/
+Downloads: https://pub.freerdp.com/releases/
 Wiki: https://github.com/FreeRDP/FreeRDP/wiki
-Downloads and other resources: http://pub.freerdp.com
-API doc: http://pub.freerdp.com/api/
+API documentation: https://pub.freerdp.com/api/
 
 IRC channel: #freerdp @ irc.freenode.net
 Mailing list: https://lists.sourceforge.net/lists/listinfo/freerdp-devel
@@ -32,5 +32,3 @@ Compilation
 
 Instructions on how to get started compiling FreeRDP can be found on the wiki:
 https://github.com/FreeRDP/FreeRDP/wiki/Compilation
-
-