diff --git a/.gitignore b/.gitignore
index ea6f6cc..76404ad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -219,3 +219,4 @@
 /anaconda-32.15.tar.bz2
 /anaconda-32.16.tar.bz2
 /anaconda-32.17.tar.bz2
+/anaconda-32.18.tar.bz2
diff --git a/anaconda.spec b/anaconda.spec
index e850880..d25eebe 100644
--- a/anaconda.spec
+++ b/anaconda.spec
@@ -4,7 +4,7 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 32.17
+Version: 32.18
 Release: 1%{?dist}
 License: GPLv2+ and MIT
 URL:     http://fedoraproject.org/wiki/Anaconda
@@ -131,6 +131,10 @@ Requires: glibc-langpack-en
 # even though the distro default is dbus-broker in F30+
 Requires: dbus-daemon
 
+# Ensure it's not possible for a version of grubby to be installed
+# that doesn't work with btrfs subvolumes correctly...
+Conflicts: grubby < 8.40-10
+
 Obsoletes: anaconda-images <= 10
 Provides: anaconda-images = %{version}-%{release}
 Obsoletes: anaconda-runtime < %{version}-%{release}
@@ -348,6 +352,31 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_d
 %{_prefix}/libexec/anaconda/dd_*
 
 %changelog
+* Tue Jan 07 2020 Martin Kolman <mkolman@redhat.com> - 32.18-1
+- Fix cppcheck problem with undefined macros (jkonecny)
+- Fix C variable use before check for NULL (jkonecny)
+- Calculate ip address for kickstart URL ending in / (imsedgar)
+- Enable /boot on btrfs subvolume with GRUB2 (ngompa13)
+- Remove the workaround in the Resize dialog (vponcova)
+- Move the support for resizing devices (vponcova)
+- Add KernelArguments.is_enabled() as a replacement for getbool() (vslavik)
+- Fix tests broken by renamed modules (vslavik)
+- keyboard: pass shared module instance of localed wrapper to tasks (rvykydal)
+- keyboard: replace safe_dbus with dasbus in LocaledWrapper (rvykydal)
+- Add tests for the KernelArguments class (vslavik)
+- Stop KernelArguments inheriting from a dictionary (vslavik)
+- Change tests to use kernel.cmdline instead of flags.cmdline (vslavik)
+- Change all uses of flags.cmdline to kernel.kernel_arguments (vslavik)
+- Rename variables to prevent conflict with importing "kernel_arguments"
+  (vslavik)
+- Change flags.cmdline to use kernel.kernel_arguments (vslavik)
+- Add kernel.kernel_arguments providing same functionality as flags.cmdline
+  (vslavik)
+- Only attempt to open the ibm,max-boot-devices sysfs entry if it exists
+  (javierm)
+- Don't add more devices in boot-device NVRAM than the maximum allowed
+  (javierm)
+
 * Thu Dec 12 2019 Martin Kolman <mkolman@redhat.com> - 32.17-1
 - Calculate the space on uninitialized disks (#1782449) (vponcova)
 - Define a method required by _schedule_actions (#1782463) (vponcova)
diff --git a/sources b/sources
index 9029c7a..a623231 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (anaconda-32.17.tar.bz2) = 5c0766da5de1f0396c710caeec393c95ed71b9e1d3e20ba4dab8d60babd194522ce636243da380c0d181604f0987627dad2b2e4eff0e14e94769cfc906e59895
+SHA512 (anaconda-32.18.tar.bz2) = 175447e4677c08320607dc47564e4d2a2f5cbe53900e3f6ea6998799e468556ebe6fd58344c186852425715ae5bf5e1cfe49d3918279d7c36cfd9f0bd5a1d7f5