diff -Nru python-certbot-apache-0.23.0/debian/changelog python-certbot-apache-0.23.0/debian/changelog
--- python-certbot-apache-0.23.0/debian/changelog	2018-04-07 03:29:59.000000000 +0000
+++ python-certbot-apache-0.23.0/debian/changelog	2018-11-26 19:05:42.000000000 +0000
@@ -1,3 +1,9 @@
+python-certbot-apache (0.23.0-0.1ubuntu16.04.1~ppa1) xenial; urgency=medium
+
+  * Backport to Xenial for LE change (LP: #1640978)
+
+ -- Michael Casadevall <mcasadevall@ubuntu.com>  Mon, 26 Nov 2018 19:05:42 +0000
+
 python-certbot-apache (0.23.0-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru python-certbot-apache-0.23.0/debian/compat python-certbot-apache-0.23.0/debian/compat
--- python-certbot-apache-0.23.0/debian/compat	2018-01-06 01:37:39.000000000 +0000
+++ python-certbot-apache-0.23.0/debian/compat	2018-11-26 19:05:42.000000000 +0000
@@ -1 +1 @@
-11
+9
diff -Nru python-certbot-apache-0.23.0/debian/control python-certbot-apache-0.23.0/debian/control
--- python-certbot-apache-0.23.0/debian/control	2018-03-16 00:33:37.000000000 +0000
+++ python-certbot-apache-0.23.0/debian/control	2018-11-26 19:05:42.000000000 +0000
@@ -1,40 +1,39 @@
 Source: python-certbot-apache
 Section: python
 Priority: optional
-Maintainer: Debian Let's Encrypt <letsencrypt-devel@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Let's Encrypt <letsencrypt-devel@lists.alioth.debian.org>
 Uploaders: Harlan Lieberman-Berg <hlieberman@debian.org>,
            Francois Marier <francois@debian.org>
-Build-Depends: debhelper (>= 11~),
+Build-Depends: debhelper (>= 9~),
                dh-python,
-               python3,
-               python3-augeas,
-               python3-certbot (>= 0.22.0~),
-               python3-configargparse (>= 0.10.0),
-               python3-mock,
-               python3-openssl (>= 0.13),
-               python3-parsedatetime (>= 1.3),
-               python3-requests,
-               python3-rfc3339,
-               python3-setuptools (>= 1.0),
-               python3-six,
-               python3-sphinx (>= 1.3.1-1~),
-               python3-sphinx-rtd-theme,
-               python3-tz,
-               python3-zope.component,
-               python3-zope.interface
+               python,
+               python-augeas,
+               python-certbot (>= 0.22.0~),
+               python-configargparse (>= 0.10.0),
+               python-mock,
+               python-openssl (>= 0.13),
+               python-parsedatetime (>= 1.3),
+               python-requests,
+               python-rfc3339,
+               python-setuptools (>= 1.0),
+               python-six,
+               python-sphinx (>= 1.3.1-1~),
+               python-sphinx-rtd-theme,
+               python-tz,
+               python-zope.component,
+               python-zope.interface
 Standards-Version: 4.1.3
 Homepage: https://letsencrypt.org/
-Vcs-Git: https://salsa.debian.org/letsencrypt-team/certbot/certbot-apache.git
-Vcs-Browser: https://salsa.debian.org/letsencrypt-team/certbot/certbot-apache
+Vcs-Git: https://salsa.debian.org/letsencrypt-team/certbot/letsencrypt-apache.git
+Vcs-Browser: https://salsa.debian.org/letsencrypt-team/certbot/letsencrypt-apache
 
-Package: python3-certbot-apache
+Package: python-certbot-apache
 Architecture: all
 Depends: apache2,
 	 certbot (>= 0.21.1~),
 	 ${misc:Depends},
-	 ${python3:Depends}
-Breaks: python-letsencrypt-apache, python-certbot-apache (<< 0.20.0~)
-Replaces: python-letsencrypt-apache, python-certbot-apache (<< 0.20.0~)
+	 ${python:Depends}
 Suggests: python-certbot-apache-doc
 Description: Apache plugin for Certbot
  The objective of Certbot, Let's Encrypt, and the ACME (Automated
@@ -73,11 +72,3 @@
    - Help you revoke the certificate if that ever becomes necessary.
  .
  This package contains the documentation for the Apache plugin.
-
-Package: python-certbot-apache
-Section: oldlibs
-Architecture: all
-Depends: python3-certbot-apache, ${misc:Depends}
-Description: transitional dummy package
- This is a transitional dummy package for the migration of certbot
- from python2 to python3.  It can safely be removed.
\ No newline at end of file
diff -Nru python-certbot-apache-0.23.0/debian/rules python-certbot-apache-0.23.0/debian/rules
--- python-certbot-apache-0.23.0/debian/rules	2018-03-22 01:31:30.000000000 +0000
+++ python-certbot-apache-0.23.0/debian/rules	2018-11-26 19:05:42.000000000 +0000
@@ -1,21 +1,17 @@
 #!/usr/bin/make -f
 
-export PYBUILD_NAME = certbot-apache
+export PYBUILD_NAME = letsencrypt-apache
+
+UPSTREAM_VERSION := $(shell head -n 1 debian/changelog | \
+		perl -ne '$$_ =~ m/\((?:[0-9]+:)?([0-9][A-Za-z0-9\.\-\+~:]*)-([0-9A-Za-z\+\.~]+)\)/; print $$1;')
 
 %:
-	dh $@ --with python3,sphinxdoc --buildsystem=pybuild
+	dh $@ --with python2,sphinxdoc --buildsystem=pybuild
 
 override_dh_auto_build:
 	dh_auto_build
-	PYTHONPATH=. \
-		http_proxy='127.0.0.1:9' \
-		https_proxy='127.0.0.1:9' \
-		sphinx-build -N -bhtml docs/ build/html
+	PYTHONPATH=. http_proxy='127.0.0.1:9' sphinx-build -N -bhtml docs/ build/html
 
 override_dh_auto_install:
 	dh_auto_install
-	rm -rf $(CURDIR)/debian/python3-certbot-apache/usr/lib/python*/dist-packages/certbot_apache/tests/testdata
-
-override_dh_installdocs:
-	dh_installdocs --doc-main-package=python3-certbot-apache -p python-certbot-apache-doc
-	dh_installdocs -p python3-certbot-apache -p python-certbot-apache
+	rm -rf $(CURDIR)/debian/python-letsencrypt-apache/usr/lib/python2.7/dist-packages/letsencrypt_apache/tests/testdata