diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8f944df..9759869 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -70,9 +70,11 @@
 
 PROJECT(PCRE2 C)
 
-# Increased minimum to 2.8.0 to support newer add_test features
+# Increased minimum to 2.8.0 to support newer add_test features. Set policy
+# CMP0026 to avoid warnings for the use of LOCATION in GET_TARGET_PROPERTY.
 
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0)
+CMAKE_POLICY(SET CMP0026 OLD)
 
 SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake) # for FindReadline.cmake
 
@@ -392,6 +394,7 @@ SET(PCRE2_SOURCES
   src/pcre2_newline.c
   src/pcre2_ord2utf.c
   src/pcre2_pattern_info.c
+  src/pcre2_serialize.c 
   src/pcre2_string_utils.c
   src/pcre2_study.c
   src/pcre2_substitute.c
@@ -561,6 +564,15 @@ IF(PCRE2_BUILD_TESTS)
     TARGET_LINK_LIBRARIES(pcre2_jit_test ${PCRE2_JIT_TEST_LIBS})
   ENDIF(PCRE2_SUPPORT_JIT)
 
+  # exes in Debug location tested by the RunTest shell script
+  # via "make test"
+   
+  IF(PCRE2_BUILD_PCRE2GREP)
+    GET_TARGET_PROPERTY(PCRE2GREP_EXE pcre2grep DEBUG_LOCATION)
+  ENDIF(PCRE2_BUILD_PCRE2GREP)
+
+  GET_TARGET_PROPERTY(PCRE2TEST_EXE pcre2test DEBUG_LOCATION)
+
 # =================================================
   # Write out a CTest configuration file
   #
diff --git a/ChangeLog b/ChangeLog
index a63ece0..f01956c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -82,6 +82,11 @@ ovector too small to capture the group.
 
 16. Improved error message in pcre2test when setting the stack size (-S) fails.
 
+17. Fixed two bugs in CMakeLists.txt: (1) Some lines had got lost in the 
+transfer from PCRE1, meaning that CMake configuration failed if "build tests" 
+was selected. (2) The file src/pcre2_serialize.c had not been added to the list 
+of PCRE2 sources, which caused a failure to build pcre2test.
+
 
 Version 10.00 05-January-2015
 -----------------------------
diff --git a/configure.ac b/configure.ac
index b474be4..ab6b8f1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,7 +10,7 @@ dnl be defined as -RC2, for example. For real releases, it should be empty.
 
 m4_define(pcre2_major, [10])
 m4_define(pcre2_minor, [10])
-m4_define(pcre2_prerelease, [-RC1])
+m4_define(pcre2_prerelease, [-RC2])
 m4_define(pcre2_date, [2015-02-20])
 
 # NOTE: The CMakeLists.txt file searches for the above variables in the first