diff --git a/appveyor.yml b/appveyor.yml
index df2b85620..dddb3c612 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,78 +1,68 @@
-# Copyright 2016, 2017 Peter Dimov
-# Copyright (C) 2017, 2018 James E. King III
+# Copyright 2016-2019 Peter Dimov
 # Distributed under the Boost Software License, Version 1.0.
 # (See accompanying file LICENSE_1_0.txt or copy at http://boost.org/LICENSE_1_0.txt)
 
-# When copying this to a new library, be sure to update the name of the library
-# in two places (once each at the top of install: and test_script:)
-
 version: 1.0.{build}-{branch}
 
 shallow_clone: true
 
 branches:
   only:
-    - develop
     - master
-
-matrix:
-  allow_failures:
-    - MAYFAIL: true
+    - develop
+    - /feature\/.*/
 
 environment:
-  global:
-    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-    # see: http://www.boost.org/build/doc/html/bbv2/overview/invocation.html#bbv2.overview.invocation.properties
-    # to use the default for a given environment, comment it out; recommend you build debug and release however..
-    # on Windows it is important to exercise all the possibilities, especially shared vs static
-    # B2_ADDRESS_MODEL: address-model=64,32
-    # B2_LINK: link=shared,static
-    # B2_THREADING: threading=multi,single
-    B2_VARIANT: variant=release,debug
-    CXXSTD: 03
-
   matrix:
-    - FLAVOR: Visual Studio 2017
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+      TOOLSET: msvc-14.0
+      CXXSTD: 14,latest
+      ADDRMD: 32,64
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
       TOOLSET: msvc-14.1
-      B2_ADDRESS_MODEL: address-model=64,32
-    - FLAVOR: Visual Studio 2013
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
-      TOOLSET: msvc-12.0
-    - FLAVOR:  mingw32
-      ARCH:    i686
-      B2_ADDRESS_MODEL: address-model=32
-      SCRIPT:  ci\mingw.bat
-    - FLAVOR:  mingw64
-      ARCH:    x86_64
-      B2_ADDRESS_MODEL: address-model=64
-      SCRIPT:  ci\mingw.bat
-    - FLAVOR: cygwin (64-bit)
+      CXXSTD: 14,17,latest
+      ADDRMD: 32,64
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+      TOOLSET: clang-win
+      CXXSTD: 14,17,latest
+      ADDRMD: 64
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+      TOOLSET: clang-win
+      CXXSTD: 14,17,20,latest
+      ADDRMD: 64
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+      ADDPATH: C:\cygwin\bin;
+      TOOLSET: gcc
+      CXXSTD: 11,14,1z
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
       ADDPATH: C:\cygwin64\bin;
-      B2_ADDRESS_MODEL: address-model=64
       TOOLSET: gcc
-      MAYFAIL: true
-    - FLAVOR: cygwin (32-bit)
-      ADDPATH: C:\cygwin\bin;
-      B2_ADDRESS_MODEL: address-model=32
+      CXXSTD: 11,14,1z
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+      ADDPATH: C:\mingw-w64\i686-8.1.0-posix-dwarf-rt_v6-rev0\mingw32\bin;
+      TOOLSET: gcc
+      CXXSTD: 11,14,17,2a
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+      ADDPATH: C:\mingw-w64\x86_64-8.1.0-posix-seh-rt_v6-rev0\mingw64\bin;
       TOOLSET: gcc
-      MAYFAIL: true
+      CXXSTD: 11,14,17,2a
 
 install:
-  - set SELF=program_options
+  - set BOOST_BRANCH=develop
+  - if "%APPVEYOR_REPO_BRANCH%" == "master" set BOOST_BRANCH=master
   - cd ..
-  - git clone -b %APPVEYOR_REPO_BRANCH% --depth 1 https://github.com/boostorg/boost.git boost-root
+  - git clone -b %BOOST_BRANCH% --depth 1 https://github.com/boostorg/boost.git boost-root
   - cd boost-root
-  - git submodule update -q --init tools/boostdep
-  - git submodule update -q --init tools/build
-  - git submodule update -q --init tools/inspect
-  - xcopy /s /e /q %APPVEYOR_BUILD_FOLDER% libs\%SELF%
-  - python tools/boostdep/depinst/depinst.py --include example %SELF%
+  - git submodule update --init tools/boostdep
+  - xcopy /s /e /q %APPVEYOR_BUILD_FOLDER% libs\program_options\
+  - python tools/boostdep/depinst/depinst.py program_options
   - cmd /c bootstrap
-  - b2 headers
+  - b2 -d0 headers
 
 build: off
 
 test_script:
-  - set SELF=program_options
   - PATH=%ADDPATH%%PATH%
-  - IF DEFINED SCRIPT (call libs\%SELF%\%SCRIPT%) ELSE (b2 libs/%SELF% toolset=%TOOLSET% cxxstd=%CXXSTD% %CXXFLAGS% %DEFINES% %B2_ADDRESS_MODEL% %B2_LINK% %B2_THREADING% %B2_VARIANT% -j3)
+  - if not "%CXXSTD%" == "" set CXXSTD=cxxstd=%CXXSTD%
+  - if not "%ADDRMD%" == "" set ADDRMD=address-model=%ADDRMD%
+  - b2 -j3 libs/program_options/test toolset=%TOOLSET% %CXXSTD% %ADDRMD% variant=debug,release