diff --git a/diskimage-builder-2.8.0.tar.gz b/diskimage-builder-2.8.0.tar.gz
deleted file mode 100644
index 7b45d2a..0000000
--- a/diskimage-builder-2.8.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ac93598cff826074c4a83049be0c3745b13891dc21e5e9d85fc354d99583c0e8
-size 315628
diff --git a/diskimage-builder-2.9.0.tar.gz b/diskimage-builder-2.9.0.tar.gz
new file mode 100644
index 0000000..b294f09
--- /dev/null
+++ b/diskimage-builder-2.9.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d6a8fa0e4be224af8365eb6ef4ed1653026b87fedca017fafdbd86fe58bcb603
+size 319035
diff --git a/diskimage-builder.changes b/diskimage-builder.changes
index 41ba887..f8f2b3c 100644
--- a/diskimage-builder.changes
+++ b/diskimage-builder.changes
@@ -1,3 +1,24 @@
+-------------------------------------------------------------------
+Mon Dec  4 13:41:57 UTC 2017 - mchandras@suse.de
+
+- Version bump to 2.9.0
+  * Add initramfs-tools for ubuntu-minimal
+  * Create /etc/machine-id for fedora
+  * Use latest Fedora .qcow URL
+  * Updated from global requirements
+  * Add missing package dependency for yaml
+  * Mention the need of dracut-regenerate element
+  * Move the ordering of the dracut regenerate command
+  * Fix cylical systemd config for dhcp-all-interfaces
+  * LVM support for dib-block-device
+  * Increase timeout for removal
+  * Add netbase to ensure /etc/protocols is placed for debian
+  * Add kpartx as a requirement to build images
+  * Clear up debian element documentation
+  * Bump fedora/fedora-minimal DIB_RELEASE 26
+  * Allow users to specify partition type in the MBR PTE
+- Fix env-script-interpreter rpmlint warnings.
+
 -------------------------------------------------------------------
 Mon Aug 14 06:22:03 UTC 2017 - mchandras@suse.de
 
diff --git a/diskimage-builder.spec b/diskimage-builder.spec
index 24c0c8c..04b324a 100644
--- a/diskimage-builder.spec
+++ b/diskimage-builder.spec
@@ -21,7 +21,7 @@
 
 %global         __requires_exclude_from ^%{python_sitelib}/diskimage_builder/elements/.*$
 Name:           diskimage-builder
-Version:        2.8.0
+Version:        2.9.0
 Release:        0
 Summary:        Image Building Tools for OpenStack
 License:        Apache-2.0
@@ -30,6 +30,7 @@ Url:            https://github.com/openstack/diskimage-builder
 Source0:        https://pypi.io/packages/source/d/%{name}/%{name}-%{version}.tar.gz
 Source99:       diskimage-builder-rpmlintrc
 BuildRequires:  fdupes
+BuildRequires:  findutils
 BuildRequires:  python-PyYAML >= 3.10.0
 BuildRequires:  python-devel
 BuildRequires:  python2-networkx >= 1.10
@@ -41,10 +42,12 @@ BuildRequires:  python-setuptools
 BuildRequires:  python-stevedore >= 1.20.0
 BuildRequires:  python-testrepository
 BuildRequires:  python-testtools
+BuildRequires:  sed
 # No stuff in python_sitelib, thus autoreqprov won't work:
+Requires:       kpartx
 Requires:       python-Babel >= 2.3.4
 Requires:       python-PyYAML >= 3.10.0
-Requires:       python-six >= 1.9.0
+Requires:       python-six >= 1.10.0
 Requires:       python-stevedore >= 1.20.0
 Requires:       python2-networkx >= 1.10
 Requires:       qemu-tools
@@ -62,6 +65,9 @@ building disk images.
 
 %prep
 %setup -q
+# Fix env-script-interpreter rpmlint warning
+find diskimage_builder/elements -type f -perm /a+x \
+	-exec sh -c "sed -E -i s@^#\!/usr/bin/env[[:space:]]+python@#\!/usr/bin/python@ {}" \;
 
 %build
 %{__python2} setup.py build