diff --git a/.gitignore b/.gitignore
index fec9ea3..2eb7320 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@
 /diskimage-builder-1.20.0.tar.gz
 /diskimage-builder-1.24.0.tar.gz
 /diskimage-builder-1.26.1.tar.gz
+/diskimage-builder-2.20.3.tar.gz
diff --git a/diskimage-builder.spec b/diskimage-builder.spec
index 99ccbc3..d441808 100644
--- a/diskimage-builder.spec
+++ b/diskimage-builder.spec
@@ -1,57 +1,100 @@
-Name:		diskimage-builder
-Summary:	Image building tools for OpenStack
-Version:	1.26.1
-Release:	8%{?dist}
-License:	ASL 2.0
-URL:		https://launchpad.net/diskimage-builder
-Source0:	http://tarballs.openstack.org/diskimage-builder/%{name}-%{version}.tar.gz
+# Macros for py2/py3 compatibility
+%if 0%{?fedora} || 0%{?rhel} > 7
+%global pyver 3
+%else
+%global pyver 2
+%endif
+
+%global pyver_bin python%{pyver}
+%global pyver_sitelib %python%{pyver}_sitelib
+%global pyver_install %py%{pyver}_install
+%global pyver_build %py%{pyver}_build
+# End of macros for py2/py3 compatibility
+
+%{!?upstream_version: %global upstream_version %{version}%{?milestone}}
+Name:           diskimage-builder
+Summary:        Image building tools for OpenStack
+Version:        2.20.3
+Release:        1%{?dist}
+License:        ASL 2.0
+Group:          System Environment/Base
+URL:            https://launchpad.net/diskimage-builder
+Source0:        https://tarballs.openstack.org/diskimage-builder/%{name}-%{upstream_version}.tar.gz
+AutoReqProv: no
 
 BuildArch: noarch
-BuildRequires: python3-devel
-BuildRequires: python3-setuptools
-BuildRequires: python3-d2to1
-BuildRequires: python3-pbr
+
+BuildRequires: python%{pyver}-devel
+BuildRequires: python%{pyver}-setuptools
+BuildRequires: python%{pyver}-pbr
+%if %{pyver} == 2
+BuildRequires: python-d2to1
+%else
+BuildRequires: python%{pyver}-d2to1
 BuildRequires: /usr/bin/pathfix.py
+%endif
 
 Requires: kpartx
 Requires: qemu-img
 Requires: curl
-Requires: python3-babel
-Requires: sudo
 Requires: tar
-Requires: yum-utils
+Requires: git
 Requires: dib-utils
-
-Obsoletes: diskimage-builder < %{version}-%{release}
-
-# Exclude all elements, as they are only run within diskimage-builder
-%global __requires_exclude_from %{_datadir}/%{name}/elements
+Requires: xfsprogs
+Requires: /bin/bash
+Requires: /bin/sh
+Requires: /usr/bin/env
+Requires: python%{pyver}
+Requires: python%{pyver}-flake8
+Requires: python%{pyver}-pbr
+Requires: python%{pyver}-six
+Requires: python%{pyver}-stevedore
+%if %{pyver} == 2
+Requires: python-babel
+Requires: python-networkx
+Requires: PyYAML
+%else
+Requires: python%{pyver}-babel
+Requires: python%{pyver}-networkx
+Requires: python%{pyver}-PyYAML
+%endif
+
+%global __requires_exclude /usr/local/bin/dib-python
+%global __requires_exclude %__requires_exclude|/sbin/runscript
 
 %prep
-%autosetup -n %{name}-%{version}
+%setup -q -n %{name}-%{upstream_version}
 
 %build
-%py3_build
+%{pyver_build}
 
 %install
-%py3_install
+%{pyver_install}
 
-mkdir -p %{buildroot}%{_datadir}/%{name}/lib
 mkdir -p %{buildroot}%{_datadir}/%{name}/elements
 
-install -p -D -m 644 lib/* %{buildroot}%{_datadir}/%{name}/lib
-cp -vr elements/ %{buildroot}%{_datadir}/%{name}
+cp -vr diskimage_builder/elements/ %{buildroot}%{_datadir}/%{name}
 
-# Fix shebangs for Python 3
+# explicitly remove config-applier since it does a pip install
+rm -rf %{buildroot}%{_datadir}/%{name}/elements/config-applier
+
+# This file is being split out of diskimage-builder, so remove it to
+# avoid conflicts with the new package.
+rm -f %{buildroot}%{_bindir}/dib-run-parts
+
+%if %{pyver} == 3
+# Fix shebangs for Python 3-only distros
 pathfix.py -pni "%{__python3} %{py3_shbang_opts}" %{buildroot}%{_datadir}/%{name}/elements/pypi/pre-install.d/00-configure-pypi-mirror
 pathfix.py -pni "%{__python3} %{py3_shbang_opts}" %{buildroot}%{_datadir}/%{name}/elements/deploy-targetcli/extra-data.d/module/targetcli-wrapper
 pathfix.py -pni "%{__python3} %{py3_shbang_opts}" %{buildroot}%{_datadir}/%{name}/elements/package-installs/bin/package-installs-squash
 pathfix.py -pni "%{__python3} %{py3_shbang_opts}" %{buildroot}%{_datadir}/%{name}/elements/svc-map/extra-data.d/10-merge-svc-map-files
 pathfix.py -pni "%{__python3} %{py3_shbang_opts}" %{buildroot}%{_datadir}/%{name}/elements/svc-map/bin/svc-map
-pathfix.py -pni "%{__python3} %{py3_shbang_opts}" %{buildroot}%{_datadir}/%{name}/elements/zypper/bin/map-packages
-pathfix.py -pni "%{__python3} %{py3_shbang_opts}" %{buildroot}%{_datadir}/%{name}/elements/zypper/bin/map-services
-pathfix.py -pni "%{__python3} %{py3_shbang_opts}" %{buildroot}%{_datadir}/%{name}/elements/rhel/bin/map-packages
-pathfix.py -pni "%{__python3} %{py3_shbang_opts}" %{buildroot}%{_datadir}/%{name}/elements/redhat-common/bin/map-services
+pathfix.py -pni "%{__python3} %{py3_shbang_opts}" %{buildroot}%{pyver_sitelib}/diskimage_builder/elements/pypi/pre-install.d/00-configure-pypi-mirror
+pathfix.py -pni "%{__python3} %{py3_shbang_opts}" %{buildroot}%{pyver_sitelib}/diskimage_builder/elements/deploy-targetcli/extra-data.d/module/targetcli-wrapper
+pathfix.py -pni "%{__python3} %{py3_shbang_opts}" %{buildroot}%{pyver_sitelib}/diskimage_builder/elements/package-installs/bin/package-installs-squash
+pathfix.py -pni "%{__python3} %{py3_shbang_opts}" %{buildroot}%{pyver_sitelib}/diskimage_builder/elements/svc-map/extra-data.d/10-merge-svc-map-files
+pathfix.py -pni "%{__python3} %{py3_shbang_opts}" %{buildroot}%{pyver_sitelib}/diskimage_builder/elements/svc-map/bin/svc-map
+%endif
 
 %description
 Components of TripleO that are responsible for building disk images.
@@ -60,11 +103,13 @@ Components of TripleO that are responsible for building disk images.
 %doc LICENSE
 %doc doc/source/ci.md
 %{_bindir}/*
-%{python3_sitelib}/diskimage_builder*
-%{_datadir}/%{name}/lib
+%{pyver_sitelib}/diskimage_builder*
 %{_datadir}/%{name}/elements
 
 %changelog
+* Fri Mar 22 2019 RDO <dev@lists.rdoproject.org> 2.20.3-1
+- Update to 2.20.3
+
 * Wed Feb 27 2019 Yatin Karel <ykarel@redhat.com> - 1.26.1-8
 - Build python3 instead of python2 as python2 is being removed
 
diff --git a/sources b/sources
index eb11c2a..07accfc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (diskimage-builder-1.26.1.tar.gz) = 698c97b7e016a87c2acd83d27400bd009e8148bb76efc737fae3344aa2c860fdf4060f1608eaa38566c24fa68c5fdbf51559ab64f9d9ef26d0adbe3a1b69325f
+SHA512 (diskimage-builder-2.20.3.tar.gz) = efefd3c19643e75794293519286d1df81b8bf88511d394b13addfd8953368f3ff6cd57a884b77a161d0b7d01b97624e4dd91d79497e22058f24747ee4a24df3a