diff --git a/.gitattributes b/.gitattributes
index 821dafd14..a60f081d7 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -24,7 +24,7 @@
 /.travis.yml export-ignore
 
 # for linguist; let github identify our project as C++ instead of C due to pcre2
-/pcre2-10.32/* linguist-vendored
+/pcre2/* linguist-vendored
 angular.js linguist-vendored
 /doc_src/* linguist-documentation
 *.fish linguist-language=fish
diff --git a/cmake/PCRE2.cmake b/cmake/PCRE2.cmake
index cad1d5405..1880d3946 100644
--- a/cmake/PCRE2.cmake
+++ b/cmake/PCRE2.cmake
@@ -15,8 +15,8 @@ IF (PCRE2_LIB AND PCRE2_INCLUDE_DIR)
   MESSAGE(STATUS "Found system PCRE2 library ${PCRE2_INCLUDE_DIR}")
 ELSE()
   MESSAGE(STATUS "Using bundled PCRE2 library")
-  ADD_SUBDIRECTORY(pcre2-10.34 EXCLUDE_FROM_ALL)
-  SET(PCRE2_INCLUDE_DIR ${CMAKE_BINARY_DIR}/pcre2-10.34/)
+  ADD_SUBDIRECTORY(pcre2 EXCLUDE_FROM_ALL)
+  SET(PCRE2_INCLUDE_DIR ${CMAKE_BINARY_DIR}/pcre2)
   SET(PCRE2_LIB pcre2-${PCRE2_WIDTH})
 ENDIF(PCRE2_LIB AND PCRE2_INCLUDE_DIR)
 INCLUDE_DIRECTORIES(${PCRE2_INCLUDE_DIR})
diff --git a/pcre2-10.34/CMakeLists.txt b/pcre2/CMakeLists.txt
similarity index 100%
rename from pcre2-10.34/CMakeLists.txt
rename to pcre2/CMakeLists.txt
diff --git a/pcre2-10.34/LICENCE b/pcre2/LICENCE
similarity index 100%
rename from pcre2-10.34/LICENCE
rename to pcre2/LICENCE
diff --git a/pcre2-10.34/cmake/FindPackageHandleStandardArgs.cmake b/pcre2/cmake/FindPackageHandleStandardArgs.cmake
similarity index 100%
rename from pcre2-10.34/cmake/FindPackageHandleStandardArgs.cmake
rename to pcre2/cmake/FindPackageHandleStandardArgs.cmake
diff --git a/pcre2-10.34/config-cmake.h.in b/pcre2/config-cmake.h.in
similarity index 100%
rename from pcre2-10.34/config-cmake.h.in
rename to pcre2/config-cmake.h.in
diff --git a/pcre2-10.34/configure.ac b/pcre2/configure.ac
similarity index 100%
rename from pcre2-10.34/configure.ac
rename to pcre2/configure.ac
diff --git a/pcre2-10.34/src/pcre2.h.in b/pcre2/src/pcre2.h.in
similarity index 100%
rename from pcre2-10.34/src/pcre2.h.in
rename to pcre2/src/pcre2.h.in
diff --git a/pcre2-10.34/src/pcre2_auto_possess.c b/pcre2/src/pcre2_auto_possess.c
similarity index 100%
rename from pcre2-10.34/src/pcre2_auto_possess.c
rename to pcre2/src/pcre2_auto_possess.c
diff --git a/pcre2-10.34/src/pcre2_chartables.c.dist b/pcre2/src/pcre2_chartables.c.dist
similarity index 100%
rename from pcre2-10.34/src/pcre2_chartables.c.dist
rename to pcre2/src/pcre2_chartables.c.dist
diff --git a/pcre2-10.34/src/pcre2_compile.c b/pcre2/src/pcre2_compile.c
similarity index 100%
rename from pcre2-10.34/src/pcre2_compile.c
rename to pcre2/src/pcre2_compile.c
diff --git a/pcre2-10.34/src/pcre2_config.c b/pcre2/src/pcre2_config.c
similarity index 100%
rename from pcre2-10.34/src/pcre2_config.c
rename to pcre2/src/pcre2_config.c
diff --git a/pcre2-10.34/src/pcre2_context.c b/pcre2/src/pcre2_context.c
similarity index 100%
rename from pcre2-10.34/src/pcre2_context.c
rename to pcre2/src/pcre2_context.c
diff --git a/pcre2-10.34/src/pcre2_convert.c b/pcre2/src/pcre2_convert.c
similarity index 100%
rename from pcre2-10.34/src/pcre2_convert.c
rename to pcre2/src/pcre2_convert.c
diff --git a/pcre2-10.34/src/pcre2_dfa_match.c b/pcre2/src/pcre2_dfa_match.c
similarity index 100%
rename from pcre2-10.34/src/pcre2_dfa_match.c
rename to pcre2/src/pcre2_dfa_match.c
diff --git a/pcre2-10.34/src/pcre2_error.c b/pcre2/src/pcre2_error.c
similarity index 100%
rename from pcre2-10.34/src/pcre2_error.c
rename to pcre2/src/pcre2_error.c
diff --git a/pcre2-10.34/src/pcre2_extuni.c b/pcre2/src/pcre2_extuni.c
similarity index 100%
rename from pcre2-10.34/src/pcre2_extuni.c
rename to pcre2/src/pcre2_extuni.c
diff --git a/pcre2-10.34/src/pcre2_find_bracket.c b/pcre2/src/pcre2_find_bracket.c
similarity index 100%
rename from pcre2-10.34/src/pcre2_find_bracket.c
rename to pcre2/src/pcre2_find_bracket.c
diff --git a/pcre2-10.34/src/pcre2_internal.h b/pcre2/src/pcre2_internal.h
similarity index 100%
rename from pcre2-10.34/src/pcre2_internal.h
rename to pcre2/src/pcre2_internal.h
diff --git a/pcre2-10.34/src/pcre2_intmodedep.h b/pcre2/src/pcre2_intmodedep.h
similarity index 100%
rename from pcre2-10.34/src/pcre2_intmodedep.h
rename to pcre2/src/pcre2_intmodedep.h
diff --git a/pcre2-10.34/src/pcre2_maketables.c b/pcre2/src/pcre2_maketables.c
similarity index 100%
rename from pcre2-10.34/src/pcre2_maketables.c
rename to pcre2/src/pcre2_maketables.c
diff --git a/pcre2-10.34/src/pcre2_match.c b/pcre2/src/pcre2_match.c
similarity index 100%
rename from pcre2-10.34/src/pcre2_match.c
rename to pcre2/src/pcre2_match.c
diff --git a/pcre2-10.34/src/pcre2_match_data.c b/pcre2/src/pcre2_match_data.c
similarity index 100%
rename from pcre2-10.34/src/pcre2_match_data.c
rename to pcre2/src/pcre2_match_data.c
diff --git a/pcre2-10.34/src/pcre2_newline.c b/pcre2/src/pcre2_newline.c
similarity index 100%
rename from pcre2-10.34/src/pcre2_newline.c
rename to pcre2/src/pcre2_newline.c
diff --git a/pcre2-10.34/src/pcre2_ord2utf.c b/pcre2/src/pcre2_ord2utf.c
similarity index 100%
rename from pcre2-10.34/src/pcre2_ord2utf.c
rename to pcre2/src/pcre2_ord2utf.c
diff --git a/pcre2-10.34/src/pcre2_pattern_info.c b/pcre2/src/pcre2_pattern_info.c
similarity index 100%
rename from pcre2-10.34/src/pcre2_pattern_info.c
rename to pcre2/src/pcre2_pattern_info.c
diff --git a/pcre2-10.34/src/pcre2_script_run.c b/pcre2/src/pcre2_script_run.c
similarity index 100%
rename from pcre2-10.34/src/pcre2_script_run.c
rename to pcre2/src/pcre2_script_run.c
diff --git a/pcre2-10.34/src/pcre2_serialize.c b/pcre2/src/pcre2_serialize.c
similarity index 100%
rename from pcre2-10.34/src/pcre2_serialize.c
rename to pcre2/src/pcre2_serialize.c
diff --git a/pcre2-10.34/src/pcre2_string_utils.c b/pcre2/src/pcre2_string_utils.c
similarity index 100%
rename from pcre2-10.34/src/pcre2_string_utils.c
rename to pcre2/src/pcre2_string_utils.c
diff --git a/pcre2-10.34/src/pcre2_study.c b/pcre2/src/pcre2_study.c
similarity index 100%
rename from pcre2-10.34/src/pcre2_study.c
rename to pcre2/src/pcre2_study.c
diff --git a/pcre2-10.34/src/pcre2_substitute.c b/pcre2/src/pcre2_substitute.c
similarity index 100%
rename from pcre2-10.34/src/pcre2_substitute.c
rename to pcre2/src/pcre2_substitute.c
diff --git a/pcre2-10.34/src/pcre2_substring.c b/pcre2/src/pcre2_substring.c
similarity index 100%
rename from pcre2-10.34/src/pcre2_substring.c
rename to pcre2/src/pcre2_substring.c
diff --git a/pcre2-10.34/src/pcre2_tables.c b/pcre2/src/pcre2_tables.c
similarity index 100%
rename from pcre2-10.34/src/pcre2_tables.c
rename to pcre2/src/pcre2_tables.c
diff --git a/pcre2-10.34/src/pcre2_ucd.c b/pcre2/src/pcre2_ucd.c
similarity index 100%
rename from pcre2-10.34/src/pcre2_ucd.c
rename to pcre2/src/pcre2_ucd.c
diff --git a/pcre2-10.34/src/pcre2_ucp.h b/pcre2/src/pcre2_ucp.h
similarity index 100%
rename from pcre2-10.34/src/pcre2_ucp.h
rename to pcre2/src/pcre2_ucp.h
diff --git a/pcre2-10.34/src/pcre2_valid_utf.c b/pcre2/src/pcre2_valid_utf.c
similarity index 100%
rename from pcre2-10.34/src/pcre2_valid_utf.c
rename to pcre2/src/pcre2_valid_utf.c
diff --git a/pcre2-10.34/src/pcre2_xclass.c b/pcre2/src/pcre2_xclass.c
similarity index 100%
rename from pcre2-10.34/src/pcre2_xclass.c
rename to pcre2/src/pcre2_xclass.c