diff --git a/SOURCES/openvswitch-2.15.0.patch b/SOURCES/openvswitch-2.15.0.patch
index 91f25dd..fb00e69 100644
--- a/SOURCES/openvswitch-2.15.0.patch
+++ b/SOURCES/openvswitch-2.15.0.patch
@@ -11,6 +11,66 @@ index 3e5136fd4e..dd29a4182d 100755
           TESTSUITEFLAGS=-j4 RECHECK=yes; then
          # testsuite.log is necessary for debugging.
          cat */_build/sub/tests/testsuite.log
+diff --git a/.cirrus.yml b/.cirrus.yml
+index 2caf36b85c..358f2ba256 100644
+--- a/.cirrus.yml
++++ b/.cirrus.yml
+@@ -8,8 +8,8 @@ freebsd_build_task:
+     memory: 8G
+ 
+   env:
+-    DEPENDENCIES: automake libtool gmake gcc wget openssl
+-                  python3 py37-openssl py37-sphinx
++    DEPENDENCIES: automake libtool gmake gcc wget openssl python3
++    PY_DEPS:      sphinx|openssl
+     matrix:
+       COMPILER: gcc
+       COMPILER: clang
+@@ -18,6 +18,7 @@ freebsd_build_task:
+     - sysctl -w kern.coredump=0
+     - pkg update -f
+     - pkg install -y ${DEPENDENCIES}
++        $(pkg search -xq "^py3[0-9]+-(${PY_DEPS})-[0-9]+" | xargs)
+ 
+   configure_script:
+     - ./boot.sh
+diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
+index c4487226be..c96666b305 100644
+--- a/.github/workflows/build-and-test.yml
++++ b/.github/workflows/build-and-test.yml
+@@ -113,6 +113,12 @@ jobs:
+     - name: checkout
+       uses: actions/checkout@v2
+ 
++    - name: fix up /etc/hosts
++      # https://github.com/actions/virtual-environments/issues/3353
++      run:  |
++        cat /etc/hosts
++        sudo sed -i "/don't remove this line/d" /etc/hosts || true
++
+     - name: create ci signature file for the dpdk cache key
+       if:   matrix.dpdk != '' || matrix.dpdk_shared != ''
+       # This will collect most of DPDK related lines, so hash will be different
+diff --git a/Documentation/automake.mk b/Documentation/automake.mk
+index ea3475f356..2a590b3a79 100644
+--- a/Documentation/automake.mk
++++ b/Documentation/automake.mk
+@@ -216,8 +216,13 @@ install-man-rst: docs-check
+ 	    $(extract_stem_and_section); \
+ 	    echo " $(MKDIR_P) '$(DESTDIR)'\"$$mandir\""; \
+ 	    $(MKDIR_P) '$(DESTDIR)'"$$mandir"; \
+-	    echo " $(INSTALL_DATA) $(SPHINXBUILDDIR)/man/$$stem.$$section '$(DESTDIR)'\"$$mandir/$$stem.$$section\""; \
+-	    $(INSTALL_DATA) $(SPHINXBUILDDIR)/man/$$stem.$$section '$(DESTDIR)'"$$mandir/$$stem.$$section"; \
++	    if test -f $(SPHINXBUILDDIR)/man/$$stem.$$section; then \
++	        filepath=$(SPHINXBUILDDIR)/man/$$stem.$$section; \
++	    else \
++	        filepath=$(SPHINXBUILDDIR)/man/$$section/$$stem.$$section; \
++	    fi; \
++	    echo " $(INSTALL_DATA) $$filepath '$(DESTDIR)'\"$$mandir/$$stem.$$section\""; \
++	    $(INSTALL_DATA) $$filepath '$(DESTDIR)'"$$mandir/$$stem.$$section"; \
+ 	done
+ else
+ install-man-rst:
 diff --git a/Documentation/topics/dpdk/pmd.rst b/Documentation/topics/dpdk/pmd.rst
 index caa7d97bef..e481e79414 100644
 --- a/Documentation/topics/dpdk/pmd.rst
diff --git a/SPECS/openvswitch2.15.spec b/SPECS/openvswitch2.15.spec
index fb88a89..09bbe7b 100644
--- a/SPECS/openvswitch2.15.spec
+++ b/SPECS/openvswitch2.15.spec
@@ -57,7 +57,7 @@ Summary: Open vSwitch
 Group: System Environment/Daemons daemon/database/utilities
 URL: http://www.openvswitch.org/
 Version: 2.15.0
-Release: 16%{?dist}
+Release: 17%{?dist}
 
 # Nearly all of openvswitch is ASL 2.0.  The bugtool is LGPLv2+, and the
 # lib/sflow*.[ch] files are SISSL
@@ -697,6 +697,14 @@ exit 0
 %endif
 
 %changelog
+* Tue May 11 2021 Open vSwitch CI <ovs-ci@redhat.com> - 2.15.0-17
+- Merging upstream branch-2.15 [RH gerrit: 120e2a5d87]
+    Commit list:
+    21452722b7 github: Fix up malformed /etc/hosts.
+    90d1984b99 doc: automake: Add support for sphinx 4.0.
+    38a8bed703 cirrus: Look up existing versions of python dependencies.
+
+
 * Mon May 10 2021 Open vSwitch CI <ovs-team@redhat.com> - 2.15.0-16
 - Merging upstream branch-2.15 [RH gerrit: dbd5501f48]
     Commit list: