diff --git a/.anaconda.metadata b/.anaconda.metadata
index 8596e9a..7464f76 100644
--- a/.anaconda.metadata
+++ b/.anaconda.metadata
@@ -1 +1 @@
-d4d750155f9f8fcedb33e13639f2c8caf0449801 SOURCES/anaconda-21.48.22.93.tar.bz2
+47c05f5047f1e90223fd51b10305aabbe83b9edc SOURCES/anaconda-21.48.22.121.tar.bz2
diff --git a/.gitignore b/.gitignore
index 5336098..3962a4b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/anaconda-21.48.22.93.tar.bz2
+SOURCES/anaconda-21.48.22.121.tar.bz2
diff --git a/SOURCES/9800-rpmostreepayload-Rework-remote-add-handling.patch b/SOURCES/9800-rpmostreepayload-Rework-remote-add-handling.patch
deleted file mode 100644
index 16b0660..0000000
--- a/SOURCES/9800-rpmostreepayload-Rework-remote-add-handling.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-From c72f979499f5af3091ad8f2017442b3728cdff2f Mon Sep 17 00:00:00 2001
-From: Colin Walters <walters@verbum.org>
-Date: Tue, 16 Jun 2015 11:24:20 -0400
-Subject: [PATCH] Rebase
-
----
- pyanaconda/packaging/rpmostreepayload.py | 67 ++++++++++++++++++++------------
- 1 file changed, 43 insertions(+), 24 deletions(-)
-
-diff --git a/pyanaconda/packaging/rpmostreepayload.py b/pyanaconda/packaging/rpmostreepayload.py
-index 5eacd9f..f979c3e 100644
---- a/pyanaconda/packaging/rpmostreepayload.py
-+++ b/pyanaconda/packaging/rpmostreepayload.py
-@@ -138,24 +138,25 @@ class RPMOSTreePayload(ArchivePayload):
-             ["admin", "--sysroot=" + iutil.getTargetPhysicalRoot(),
-              "init-fs", iutil.getTargetPhysicalRoot()])
- 
--        repo_arg = "--repo=" + iutil.getTargetPhysicalRoot() + '/ostree/repo'
-+        self._sysroot_path = Gio.File.new_for_path(iutil.getTargetPhysicalRoot())
-+        sysroot = OSTree.Sysroot.new(self._sysroot_path)
-+        sysroot.load(cancellable)
-+        repo = sysroot.get_repo(None)[1]
-+        # We don't support resuming from interrupted installs
-+        repo.set_disable_fsync(True)
- 
--        # Store this for use in postInstall too, where we need to
--        # undo/redo this step.
--        self._base_remote_args = ["remote", "add"]
-+        self._remoteOptions = {}
-+
-+        # Handle variations in pykickstart
-         if ((hasattr(ostreesetup, 'noGpg') and ostreesetup.noGpg) or
-             (hasattr(ostreesetup, 'nogpg') and ostreesetup.nogpg)):
--            self._base_remote_args.append("--set=gpg-verify=false")
--        self._base_remote_args.extend([ostreesetup.remote,
--                                     ostreesetup.url])
--        self._safeExecWithRedirect("ostree", [repo_arg] + self._base_remote_args)
-+            self._remoteOptions['gpg-verify'] = GLib.Variant('b', False)
- 
--        self._sysroot_path = sysroot_path = Gio.File.new_for_path(iutil.getTargetPhysicalRoot())
--        sysroot = OSTree.Sysroot.new(sysroot_path)
--        sysroot.load(cancellable)
-+        repo.remote_change(None, OSTree.RepoRemoteChange.ADD_IF_NOT_EXISTS,
-+                           ostreesetup.remote, ostreesetup.url,
-+                           GLib.Variant('a{sv}', self._remoteOptions),
-+                           cancellable)
- 
--        repo = sysroot.get_repo(None)[1]
--        repo.set_disable_fsync(True)
-         progressQ.send_message(_("Starting pull of %(branchName)s from %(source)s") % \
-                                {"branchName": ostreesetup.ref, "source": ostreesetup.remote})
- 
-@@ -174,6 +175,14 @@ class RPMOSTreePayload(ArchivePayload):
- 
-         progressQ.send_message(_("Preparing deployment of %s") % (ostreesetup.ref, ))
- 
-+        # Now that we have the data pulled, delete the remote for now.
-+        # This will allow a remote configuration defined in the tree
-+        # (if any) to override what's in the kickstart.  Otherwise,
-+        # we'll re-add it in post.  Ideally, ostree would support a
-+        # pull without adding a remote, but that would get quite
-+        # complex.
-+        repo.remote_delete(self.data.ostreesetup.remote, None)
-+
-         self._safeExecWithRedirect("ostree",
-             ["admin", "--sysroot=" + iutil.getTargetPhysicalRoot(),
-              "os-init", ostreesetup.osname])
-@@ -250,24 +259,34 @@ class RPMOSTreePayload(ArchivePayload):
- 
-     def postInstall(self):
-         super(RPMOSTreePayload, self).postInstall()
--
-+        
-         from gi.repository import OSTree
-         cancellable = None
- 
--        # Reload this data - we couldn't keep it open across
--        # the remounts happening.
-         sysroot = OSTree.Sysroot.new(self._sysroot_path)
-         sysroot.load(cancellable)
-         repo = sysroot.get_repo(None)[1]
- 
--        # This is an ugly hack - we didn't have /etc/ostree/remotes.d,
--        # so the remote went into /ostree/repo/config.  But we want it
--        # in /etc, so delete that remote, then re-add it to
--        # /etc/ostree/remotes.d, executing ostree inside the sysroot
--        # so that it understands it's a "system repository" and should
--        # modify /etc.
--        repo.remote_delete(self.data.ostreesetup.remote, None)
--        self._safeExecWithRedirect("ostree", self._base_remote_args, root=iutil.getSysroot())
-+        # CentOS specific patch (for now) - pull the remote config from usr/etc if it exists.
-+        # The OSTree handling here was buggy in that it wasn't looking in the sysroot
-+        # for existing remotes.
-+        default_remote_path = iutil.getSysroot() + '/usr/etc/ostree/remotes.d/' + self.data.ostreesetup.osname + '.conf'
-+        if os.path.isfile(default_remote_path):
-+            destpath = iutil.getSysroot() + '/etc/ostree/remotes.d/' + os.path.basename(default_remote_path)
-+            self._safeExecWithRedirect('cp', ['-r', '-p', default_remote_path, destpath])
-+        else:
-+            # Following up on the "remote delete" above, we removed the
-+            # remote from /ostree/repo/config.  But we want it in /etc, so
-+            # re-add it to /etc/ostree/remotes.d, using the sysroot path.
-+            #
-+            # However, we ignore the case where the remote already exists,
-+            # which occurs when the content itself provides the remote
-+            # config file.
-+            repo.remote_change(Gio.File.new_for_path(iutil.getSysroot()),
-+                               OSTree.RepoRemoteChange.ADD_IF_NOT_EXISTS,
-+                               self.data.ostreesetup.remote, self.data.ostreesetup.url,
-+                               GLib.Variant('a{sv}', self._remoteOptions),
-+                               cancellable)
- 
-         boot = iutil.getSysroot() + '/boot'
- 
--- 
-1.8.3.1
-
diff --git a/SOURCES/anaconda-centos-add-centos-install-class.patch b/SOURCES/anaconda-centos-add-centos-install-class.patch
deleted file mode 100644
index 208a851..0000000
--- a/SOURCES/anaconda-centos-add-centos-install-class.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-diff -uNr anaconda-21.48.22.56__orig/pyanaconda/installclasses/fedora.py anaconda-21.48.22.56/pyanaconda/installclasses/fedora.py
---- anaconda-21.48.22.56__orig/pyanaconda/installclasses/fedora.py	2015-10-22 17:34:02.000000000 +0100
-+++ anaconda-21.48.22.56/pyanaconda/installclasses/fedora.py	2015-12-07 16:40:33.122000000 +0000
-@@ -25,7 +25,7 @@
- class FedoraBaseInstallClass(BaseInstallClass):
-     name = "Fedora"
-     sortPriority = 10000
--    if productName.startswith("Red Hat "):
-+    if productName.startswith("Red Hat ") or productName.startswith("CentOS"):
-         hidden = True
- 
-     _l10n_domain = "anaconda"
-diff -uNr anaconda-21.48.22.56__orig/pyanaconda/installclasses/centos.py anaconda-21.48.22.56/pyanaconda/installclasses/centos.py
---- anaconda-21.48.22.56__orig/pyanaconda/installclasses/centos.py	1970-01-01 01:00:00.000000000 +0100
-+++ anaconda-21.48.22.56/pyanaconda/installclasses/centos.py	2015-12-07 16:52:11.157000000 +0000
-@@ -0,0 +1,97 @@
-+#
-+# rhel.py
-+#
-+# Copyright (C) 2010  Red Hat, Inc.  All rights reserved.
-+#
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+#
-+
-+from pyanaconda.installclass import BaseInstallClass
-+from pyanaconda.product import productName
-+from pyanaconda import network
-+from pyanaconda import nm
-+from pyanaconda.kickstart import getAvailableDiskSpace
-+from blivet.partspec import PartSpec
-+from blivet.platform import platform
-+from blivet.devicelibs import swap
-+from blivet.size import Size
-+
-+class RHELBaseInstallClass(BaseInstallClass):
-+    name = "CentOS Linux"
-+    sortPriority = 20001
-+    if not productName.startswith("CentOS"):
-+        hidden = True
-+    defaultFS = "xfs"
-+
-+    bootloaderTimeoutDefault = 5
-+
-+    ignoredPackages = ["ntfsprogs", "reiserfs-utils", "hfsplus-tools"]
-+
-+    installUpdates = False
-+
-+    _l10n_domain = "comps"
-+
-+    efi_dir = "centos"
-+
-+    help_placeholder = "CentOSPlaceholder.html"
-+    help_placeholder_with_links = "CentOSPlaceholderWithLinks.html"
-+
-+    def configure(self, anaconda):
-+        BaseInstallClass.configure(self, anaconda)
-+        self.setDefaultPartitioning(anaconda.storage)
-+
-+    def setNetworkOnbootDefault(self, ksdata):
-+        if any(nd.onboot for nd in ksdata.network.network if nd.device):
-+            return
-+        # choose the device used during installation
-+        # (ie for majority of cases the one having the default route)
-+        dev = network.default_route_device() \
-+              or network.default_route_device(family="inet6")
-+        if not dev:
-+            return
-+        # ignore wireless (its ifcfgs would need to be handled differently)
-+        if nm.nm_device_type_is_wifi(dev):
-+            return
-+        network.update_onboot_value(dev, "yes", ksdata)
-+
-+    def __init__(self):
-+        BaseInstallClass.__init__(self)
-+
-+class RHELAtomicInstallClass(RHELBaseInstallClass):
-+    name = "CentOS Atomic Host"
-+    sortPriority=21001
-+    hidden = not productName.startswith(("CentOS Atomic Host", "CentOS Linux Atomic"))
-+
-+    def setDefaultPartitioning(self, storage):
-+        autorequests = [PartSpec(mountpoint="/", fstype=storage.defaultFSType,
-+                                size=Size("1GiB"), maxSize=Size("3GiB"), grow=True, lv=True)]
-+
-+        bootreqs = platform.setDefaultPartitioning()
-+        if bootreqs:
-+            autorequests.extend(bootreqs)
-+
-+        disk_space = getAvailableDiskSpace(storage)
-+        swp = swap.swapSuggestion(disk_space=disk_space)
-+        autorequests.append(PartSpec(fstype="swap", size=swp, grow=False,
-+                                    lv=True, encrypted=True))
-+
-+        for autoreq in autorequests:
-+            if autoreq.fstype is None:
-+                if autoreq.mountpoint == "/boot":
-+                    autoreq.fstype = storage.defaultBootFSType
-+                    autoreq.size = Size("300MiB")
-+                else:
-+                    autoreq.fstype = storage.defaultFSType
-+
-+        storage.autoPartitionRequests = autorequests
diff --git a/SOURCES/anaconda-centos-bootfs-default-to-xfs.patch b/SOURCES/anaconda-centos-bootfs-default-to-xfs.patch
deleted file mode 100644
index b03ef3a..0000000
--- a/SOURCES/anaconda-centos-bootfs-default-to-xfs.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -uNr anaconda-21.48.22.56__orig/pyanaconda/bootloader.py anaconda-21.48.22.56/pyanaconda/bootloader.py
---- anaconda-21.48.22.56__orig/pyanaconda/bootloader.py	2015-10-29 14:23:19.000000000 +0000
-+++ anaconda-21.48.22.56/pyanaconda/bootloader.py	2015-12-07 17:23:41.013000000 +0000
-@@ -1411,7 +1411,7 @@
- 
-     @property
-     def stage2_format_types(self):
--        if productName.startswith("Red Hat "):
-+        if productName.startswith("Red Hat ") or productName.startswith("CentOS"):
-             return ["xfs", "ext4", "ext3", "ext2", "btrfs"]
-         else:
-             return ["ext4", "ext3", "ext2", "btrfs", "xfs"]
-@@ -2105,7 +2105,7 @@
- 
-     @property
-     def stage2_format_types(self):
--        if productName.startswith("Red Hat "):
-+        if productName.startswith("Red Hat ") or productName.startswith("CentOS"):
-             return ["xfs", "ext4", "ext3", "ext2"]
-         else:
-             return ["ext4", "ext3", "ext2", "xfs"]
diff --git a/SOURCES/anaconda-centos-disable-mirrors.patch b/SOURCES/anaconda-centos-disable-mirrors.patch
deleted file mode 100644
index a6843ef..0000000
--- a/SOURCES/anaconda-centos-disable-mirrors.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -uNr anaconda-21.48.22.56__orig/pyanaconda/packaging/yumpayload.py anaconda-21.48.22.56/pyanaconda/packaging/yumpayload.py
---- anaconda-21.48.22.56__orig/pyanaconda/packaging/yumpayload.py	2015-10-29 14:23:19.000000000 +0000
-+++ anaconda-21.48.22.56/pyanaconda/packaging/yumpayload.py	2015-12-07 17:36:49.070000000 +0000
-@@ -481,12 +481,16 @@
-     @property
-     def mirrorEnabled(self):
-         with _yum_lock:
--            # yum initializes with plugins disabled, and when plugins are disabled
--            # _yum.plugins is a DummyYumPlugins object, which has no useful attributes.
--            if hasattr(self._yum.plugins, "_plugins"):
--                return "fastestmirror" in self._yum.plugins._plugins
-+            # we just skip this on CentOS since we cant support it yet
-+            if productName.startswith("CentOS"):
-+              return False
-             else:
--                return False
-+              # yum initializes with plugins disabled, and when plugins are disabled
-+              # _yum.plugins is a DummyYumPlugins object, which has no useful attributes.
-+              if hasattr(self._yum.plugins, "_plugins"):
-+                  return "fastestmirror" in self._yum.plugins._plugins
-+              else:
-+                  return False
- 
-     def getRepo(self, repo_id):
-         """ Return the yum repo object. """
-diff -uNr anaconda-21.48.22.56__orig/pyanaconda/packaging/yumpayload.py anaconda-21.48.22.56/pyanaconda/packaging/yumpayload.py
---- anaconda-21.48.22.56__orig/pyanaconda/packaging/yumpayload.py	2015-12-07 21:29:36.058347960 +0000
-+++ anaconda-21.48.22.56/pyanaconda/packaging/yumpayload.py	2015-12-07 21:32:50.255770594 +0000
-@@ -43,6 +43,7 @@
- from pyanaconda.iutil import execReadlines
- from pyanaconda.simpleconfig import simple_replace
- from functools import wraps
-+from pyanaconda.product import productName 
- 
- import logging
- log = logging.getLogger("packaging")
diff --git a/SOURCES/anaconda-centos-help-text.patch b/SOURCES/anaconda-centos-help-text.patch
deleted file mode 100644
index 329bfe9..0000000
--- a/SOURCES/anaconda-centos-help-text.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -uNr anaconda-21.48.22.56__orig/data/help/en-US/CentOSPlaceholder.html anaconda-21.48.22.56/data/help/en-US/CentOSPlaceholder.html
---- anaconda-21.48.22.56__orig/data/help/en-US/CentOSPlaceholder.html	1970-01-01 01:00:00.000000000 +0100
-+++ anaconda-21.48.22.56/data/help/en-US/CentOSPlaceholder.html	2015-12-07 17:07:05.017000000 +0000
-@@ -0,0 +1,5 @@
-+<body>
-+<h1>The Anaconda built-in help</h1>
-+<p>...is not yet available for this screen.</p>
-+<p>You can check out the CentOS Linux resouces online at https://wiki.centos.org/InstallerHelp.</p>
-+</body>
-diff -uNr anaconda-21.48.22.56__orig/data/help/en-US/CentOSPlaceholderWithLinks.html anaconda-21.48.22.56/data/help/en-US/CentOSPlaceholderWithLinks.html
---- anaconda-21.48.22.56__orig/data/help/en-US/CentOSPlaceholderWithLinks.html	1970-01-01 01:00:00.000000000 +0100
-+++ anaconda-21.48.22.56/data/help/en-US/CentOSPlaceholderWithLinks.html	2015-12-07 17:09:47.845000000 +0000
-@@ -0,0 +1,5 @@
-+<body>
-+<h1>The Anaconda built-in help</h1>
-+<p>...is not yet available for this screen.</p>
-+<p>You can check out the CentOS Linux resouces online at https://wiki.centos.org/InstallerHelp.</p>
-+</body>
diff --git a/SOURCES/anaconda-centos-set-right-eula-location.patch b/SOURCES/anaconda-centos-set-right-eula-location.patch
deleted file mode 100644
index e33eb4e..0000000
--- a/SOURCES/anaconda-centos-set-right-eula-location.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uNr anaconda-19.31.79__orig/pyanaconda/constants.py anaconda-19.31.79/pyanaconda/constants.py
---- anaconda-19.31.79__orig/pyanaconda/constants.py	2014-04-29 01:45:59.000000000 +0100
-+++ anaconda-19.31.79/pyanaconda/constants.py	2014-06-18 23:42:35.944668381 +0100
-@@ -50,7 +50,7 @@
- productArch = product.productArch
- bugzillaUrl = product.bugUrl
- isFinal = product.isFinal
--eulaLocation = "/usr/share/redhat-release/EULA"
-+eulaLocation = "/usr/share/centos-release/EULA"
- 
- # for use in device names, eg: "fedora", "rhel"
- shortProductName = productName.lower()
diff --git a/SOURCES/anaconda-centos-skip-retry-if-not-connected.patch b/SOURCES/anaconda-centos-skip-retry-if-not-connected.patch
deleted file mode 100644
index 2e51bc2..0000000
--- a/SOURCES/anaconda-centos-skip-retry-if-not-connected.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -uNr anaconda-21.48.22.56__orig/pyanaconda/packaging/yumpayload.py anaconda-21.48.22.56/pyanaconda/packaging/yumpayload.py
---- anaconda-21.48.22.56__orig/pyanaconda/packaging/yumpayload.py       2015-12-08 14:36:52.533000000 +0000
-+++ anaconda-21.48.22.56/pyanaconda/packaging/yumpayload.py     2015-12-08 14:38:51.464000000 +0000
-@@ -648,6 +648,10 @@
-                     # so that unattended installations on unreliable networks have
-                     # a higher chance of finishing successfully
-                     xdelay = xprogressive_delay()
-+                    if not nm_is_connected():
-+                      MAX_METADATA_DOWNLOAD_RETRIES = 1
-+                    else:
-+                      MAX_METADATA_DOWNLOAD_RETRIES = 10
-                     for retry_count in xrange(0, MAX_METADATA_DOWNLOAD_RETRIES + 1):
-                         if retry_count > 0:
-                             # introduce a retry delay
diff --git a/SPECS/anaconda.spec b/SPECS/anaconda.spec
index 969a2c3..dd70120 100644
--- a/SPECS/anaconda.spec
+++ b/SPECS/anaconda.spec
@@ -2,8 +2,8 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 21.48.22.93
-Release: 1%{?dist}.0.1
+Version: 21.48.22.121
+Release: 1%{?dist}
 License: GPLv2+ and MIT
 Group:   Applications/System
 URL:     http://fedoraproject.org/wiki/Anaconda
@@ -14,19 +14,12 @@ URL:     http://fedoraproject.org/wiki/Anaconda
 # ./autogen.sh
 # make dist
 Source0: %{name}-%{version}.tar.bz2
-Patch1:	anaconda-centos-add-centos-install-class.patch
-Patch2:	anaconda-centos-set-right-eula-location.patch
-Patch4:	anaconda-centos-disable-mirrors.patch
-Patch5:	anaconda-centos-bootfs-default-to-xfs.patch
-Patch6:	anaconda-centos-help-text.patch
-Patch7:	anaconda-centos-skip-retry-if-not-connected.patch
-Patch8: 9800-rpmostreepayload-Rework-remote-add-handling.patch
- 
+
 # Versions of required components (done so we make sure the buildrequires
 # match the requires versions of things).
 %define gettextver 0.18.1
 %define intltoolver 0.31.2-3
-%define pykickstartver 1.99.66.9
+%define pykickstartver 1.99.66.12
 %define yumver 3.4.3-91
 %define partedver 1.8.1
 %define pypartedver 2.5-2
@@ -95,7 +88,7 @@ The anaconda package is a metapackage for the Anaconda installer.
 
 %package core
 Summary: Core of the Anaconda installer
-Requires: python-blivet >= 1:0.61.15.52
+Requires: python-blivet >= 1:0.61.15.60
 Requires: python-meh >= %{mehver}
 Requires: libreport-anaconda >= 2.0.21-1
 Requires: libreport-rhel-anaconda-bugzilla >= 2.1.11-1
@@ -184,7 +177,7 @@ Requires: keybinder3
 Requires: NetworkManager-wifi
 %endif
 Requires: yelp
-#Requires: anaconda-user-help >= %{helpver}
+Requires: anaconda-user-help >= %{helpver}
 
 # Needed to compile the gsettings files
 BuildRequires: gsettings-desktop-schemas
@@ -233,13 +226,6 @@ runtime on NFS/HTTP/FTP servers or local disks.
 
 %prep
 %setup -q
-%patch1 -p1
-%patch2 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
 
 %build
 %configure --disable-static \
@@ -332,15 +318,294 @@ update-desktop-database &> /dev/null || :
 %{_prefix}/libexec/anaconda/dd_*
 
 %changelog
-* Thu Nov 30 2016 Johnny Hughes <johnny@centos.org> - 21.48.22.93-1.el7.centos.0.1
-- Refactor anaconda-centos-add-centos-install-class.patch for NM Autoconnect issue
-
-* Thu Nov 03 2016 CentOS Sources <bugs@centos.org> - 21.48.22.93-1.el7.centos
-- Add CentOS install class as default
-- use the right path for the EULA string (issue 7165,  bstinson)
-- use efi_dir = centos
-- disable the mirrorlist options
-- make boot part fs default to xfs
+* Wed Jun 21 2017 Radek Vykydal <rvykydal@redhat.com> - 21.48.22.121-1
+- rpmostreepayload: Stub out payload methods which use `import rpm` (walters)
+  Related: rhbz#1462979
+
+* Tue Jun 13 2017 Radek Vykydal <rvykydal@redhat.com> - 21.48.22.120-1
+- Update translations (ljanda)
+  Related: rhbz#1383911
+
+* Mon Jun 12 2017 Radek Vykydal <rvykydal@redhat.com> - 21.48.22.119-1
+- Delete file systems used only by a given installation (vponcova)
+  Resolves: rhbz#1453097
+
+* Thu Jun 08 2017 Radek Vykydal <rvykydal@redhat.com> - 21.48.22.118-1
+- rpmostreepayload: [rhel7only] Move tmpfiles to after mount setup (walters)
+  Resolves: rhbz#1459623
+- rpmostreepayload: Handle /var as a user-specified mountpoint (walters)
+  Resolves: rhbz#1459623
+
+* Tue May 30 2017 Radek Vykydal <rvykydal@redhat.com> - 21.48.22.117-1
+- Root checking fixes password for password from kickstart (mkolman)
+  Related: rhbz#1356966
+- Improve the GUI password checker (mkolman)
+  Related: rhbz#1356966
+- Respect changesok policy on root password spoke (mkolman)
+  Resolves: rhbz#1356966
+- Update translations of password checking strings (rvykydal)
+  Resolves: rhbz#1383911
+
+* Mon May 29 2017 Radek Vykydal <rvykydal@redhat.com> - 21.48.22.116-1
+- Allow nonstrict behaviour for all passwords in tui (vponcova)
+  Resolves: rhbz#1450326
+- Fix setting errors and warnings in the StorageCheckHandler (vponcova)
+  Resolves: rhbz#1453130
+- Mark post inst tools as disabled only if firstboot --disable is used
+  (mkolman)
+  Resolves: rhbz#1448940
+- Set the default filesystem type from a kickstart file (vponcova)
+  Resolves: rhbz#1449099
+
+* Wed May 24 2017 Radek Vykydal <rvykydal@redhat.com> - 21.48.22.115-1
+- Show a no network warning for network installation source. (vponcova)
+  Related: rhbz#1418604
+- Show warnings about enabling the network time (vponcova)
+  Resolves: rhbz#1418604
+- Fix generating UUID even for pre snapshots (jkonecny)
+  Related: rhbz#1113207
+
+* Mon May 15 2017 Radek Vykydal <rvykydal@redhat.com> - 21.48.22.114-1
+- Show the text of completions in the datetime spoke. (vponcova)
+  Related: rhbz#1447984
+- Look higher for the combobox associated with an entry (dshea)
+  Resolves: rhbz#1447984
+- Fix the addon handlers for the checkbox (vponcova)
+  Resolves: rhbz#1448187
+
+* Thu May 11 2017 Radek Vykydal <rvykydal@redhat.com> - 21.48.22.113-1
+- network: handle multiple connections for one device better (rvykydal)
+  Resolves: rhbz#1444887
+- network: catch exception when reading in-memory connection being removed
+  (rvykydal)
+  Related: rhbz#1444887
+- Compare empty confirmation field against input (mkolman)
+  Resolves: rhbz#1438832
+
+* Tue May 09 2017 Radek Vykydal <rvykydal@redhat.com> - 21.48.22.112-1
+- Properly iterate over kickstart locations in a job (vponcova)
+  Resolves: rhbz#1443485
+- Onlyuse devices of the ignoredisk command should be only disks (vponcova)
+  Related: rhbz#1327439
+- Fix device_name_is_disk to fully support raid devices (vponcova)
+  Resolves: rhbz#1327439
+
+* Thu Apr 27 2017 Radek Vykydal <rvykydal@redhat.com> - 21.48.22.111-1
+- Adapt to treeinfo addon section format change (rvykydal)
+  Related: rhbz#1437510
+- Make geolocation with kickstart possible (mkolman)
+  Resolves: rhbz#1358331
+- Show or hide the content of the expander (vponcova)
+  Resolves: rhbz#1441733
+- Fix a typo in anaconda-pre.service (mkolman)
+  Resolves: rhbz#1421246
+
+* Thu Apr 20 2017 Radek Vykydal <rvykydal@redhat.com> - 21.48.22.110-1
+- Adapt to treeinfo format change (variants -> addons) (rvykydal)
+  Resolves: rhbz#1437510
+- network: fix setting hostname via boot options (rvykydal)
+  Resolves: rhbz#1441337
+- Bump version of Pykickstart and Blivet (jkonecny)
+  Related: rhbz#1113207
+- Add XFS uuid changer (jkonecny)
+  Related: rhbz#1113207
+- Support --when parameter in snapshot (jkonecny)
+  Related: rhbz#1113207
+- Add snapshot support (jkonecny)
+  Resolves: rhbz#1113207
+
+* Wed Apr 12 2017 Radek Vykydal <rvykydal@redhat.com> - 21.48.22.109-1
+- Update 64bit grub2 support to reflect packages as they actually landed
+  (pjones)
+  Related: rhbz#1310779
+- Fix potential bugs reported by Pylint 1.6 (mkolman)
+  Related: rhbz#1440190
+- Fix unused variables and imports (mkolman)
+  Related: rhbz#1440190
+- Disable Pylint false positives (mkolman)
+  Related: rhbz#1440190
+- Fix Pylint LoggingChecker usage (mkolman)
+  Resolves: rhbz#1440190
+- Call subprocess.Popen with absolute path to a binary (rvykydal)
+  Resolves: rhbz#1411407
+
+* Mon Apr 10 2017 Radek Vykydal <rvykydal@redhat.com> - 21.48.22.108-1
+- Gtk: Fix css selectors. (vponcova)
+  Resolves: rhbz#1439766
+- Gtk: Set CSS names on all of the anaconda classes. (dshea)
+  Resolves: rhbz#1439766
+- Gtk: Fix deprecated pseudo-classes. (vponcova)
+  Resolves: rhbz#1433943
+- Gtk: Fix warnings in anaconda widgets. (dshea)
+  Resolves: rhbz#1433943
+- Gtk: Calculate the preferred size of the image. (vponcova)
+  Resolves: rhbz#1433943
+
+* Tue Apr 04 2017 Radek Vykydal <rvykydal@redhat.com> - 21.48.22.107-1
+- Gtk: Add gi.require_version to specify versions. (vponcova)
+  Resolves: rhbz#1433943
+- Use the function we already have for applying disk selection (rvykydal)
+  Related: rhbz#1412022
+- Ignore disks labeled OEMDRV (rvykydal)
+  Resolves: rhbz#1412022
+
+* Mon Apr 03 2017 Radek Vykydal <rvykydal@redhat.com> - 21.48.22.106-1
+- Pylint fixes (rvykydal)
+  Related: rhbz#1429576
+- Make 64-bit kernel on 32-bit firmware work for x86 efi machines (pjones)
+  Resolves: rhbz#1310779
+
+* Wed Mar 29 2017 Radek Vykydal <rvykydal@redhat.com> - 21.48.22.105-1
+- gui: show supported locales on Atomic Host installs (jlebon)
+  Resolves: rhbz#1429576
+- Specify unit for reserved space in VG (vpodzime)
+  Resolves: rhbz#1260887
+- Add support for --chunksize raid kickstart option (vtrefny)
+  Resolves: rhbz#1332316
+
+* Thu Mar 23 2017 Radek Vykydal <rvykydal@redhat.com> - 21.48.22.104-1
+- util: Add script to capture logs (riehecky)
+  Resolves: rhbz#1431313
+
+* Mon Mar 20 2017 Radek Vykydal <rvykydal@redhat.com> - 21.48.22.103-1
+- network tui: fix changing ipv4 config from static to dhcp (rvykydal)
+  Resolves: rhbz#1432886
+
+* Thu Mar 16 2017 Radek Vykydal <rvykydal@redhat.com> - 21.48.22.102-1
+- Add support for kickstart %%onerror scripts (clumens)
+  Resolves: rhbz#1412538
+- Fix partial kickstart software selection in GUI (jkonecny)
+  Related: rhbz#1404158
+- Show the network spoke in Initial Setup TUI (mkolman)
+  Resolves: rhbz#1302165
+- yum: Always release payload and catch raised exceptions. (vponcova)
+  Related: rhbz#979307
+- tui: Treat dependency errors as errors in the software spoke (vponcova)
+  Resolves: rhbz#979307
+- tui: Properly initialize the software spoke. (vponcova)
+  Related: rhbz#1371229
+- Propagate firstboot --disable to Screen Access Manager (mkolman)
+  Related: rhbz#1422867
+- Use Screen Access Manager (mkolman)
+  Related: rhbz#1422867
+- Add screen entry/exit callbacks (mkolman)
+  Related: rhbz#1422867
+- Add screen access manager (mkolman)
+  Resolves: rhbz#1422867
+- Removed unused code in the Software spoke (jkonecny)
+  Related: rhbz#1404158
+- Fix selection logic in Software spoke (jkonecny)
+  Resolves: rhbz#1404158
+- Support --nohome option in the autopartitioning (vponcova)
+  Resolves: rhbz#663099
+- tui: Remember the custom software selection (vponcova)
+  Resolves: rhbz#1371229
+
+* Mon Mar 13 2017 Radek Vykydal <rvykydal@redhat.com> - 21.48.22.101-1
+- Mock can now be set more easily by CI (jkonecny)
+  Resolves: rhbz#1430728
+
+* Mon Mar 06 2017 Radek Vykydal <rvykydal@redhat.com> - 21.48.22.100-1
+- Fix Driver Disc documentation (jkonecny)
+  Related: rhbz#1377233
+- Support DD rpm loading from local disk device (jkonecny)
+  Resolves: rhbz#1377233
+- Fix a Pylint warning (mkolman)
+  Related: rhbz#1425760
+- Remove redundant help content generation code (mkolman)
+  Resolves: rhbz#1428787
+- network: create dracut arguments for iSCSI root accessed via vlan (rvykydal)
+  Resolves: rhbz#1374003
+- Add support for RHVH custom storage checking (vponcova)
+  Related: rhbz#1412151
+- Enable the install class to customize the storage checking (vponcova)
+  Resolves: rhbz#1412151
+- Replace sanity check with more advanced storage checker (vponcova)
+  Related: rhbz#1412151
+- Rename StorageChecker to StorageCheckHandler (vponcova)
+  Related: rhbz#1412151
+- Perform recursive copying of driver disk RPM repo contents (esyr)
+  Resolves: rhbz#1425760
+- Fix a typo in an error message (esyr)
+  Related: rhbz#1425760
+- Don't block gui during dasd formating (vponcova)
+  Resolves: rhbz#1335465
+- rhev: add /home /tmp /var/log /var/log/audit (dougsland)
+  Resolves: rhbz#1422952
+- Increase verbosity of lvmdump in pre logging script (jkonecny)
+  Related: rhbz#1255659
+
+* Mon Feb 27 2017 Radek Vykydal <rvykydal@redhat.com> - 21.48.22.99-1
+- Improved password quality checking (mkolman)
+  Resolves: rhbz#1380277
+  Resolves: rhbz#1383718
+  Resolves: rhbz#1356975
+- Use correct default password quality value (mkolman)
+  Related: rhbz#1380277
+  Related: rhbz#1383718
+- Use initialization controller for spoke initialization (mkolman)
+  Related: rhbz#1380224
+- Add module initialization controller (mkolman)
+  Resolves: rhbz#1380224
+- Add the synchronized decorator (mkolman)
+  Related: rhbz#1380224
+- Add a signal/slot implementation (mkolman)
+  Related: rhbz#1380224
+
+* Mon Feb 20 2017 Radek Vykydal <rvykydal@redhat.com> - 21.48.22.98-1
+- Lock empty root password during kickstart installation (mkolman)
+  Resolves: rhbz#1383656
+- Enable multiple inst.stage2 urls (vponcova)
+  Resolves: rhbz#1391724
+- Enable multiple inst.ks urls (vponcova)
+  Resolves: rhbz#1391724
+- tui: AutoPartSpoke should not be discovered by a hub (vponcova)
+  Related: rhbz#1380767
+- Enable to define the autopart type in an install class (vponcova)
+  Resolves: rhbz#1380767
+- Always set the default partitioning (vponcova)
+  Resolves: rhbz#1380767
+
+* Mon Feb 13 2017 Radek Vykydal <rvykydal@redhat.com> - 21.48.22.97-1
+- Add inst.waitfornet option (rvykydal)
+  Resolves: rhbz#1315160
+- Add support for IPoIB in tui (rvykydal)
+  Resolves: rhbz#1366935
+
+* Tue Feb 07 2017 Radek Vykydal <rvykydal@redhat.com> - 21.48.22.96-1
+- Add unit test for RepoMDMetaHash object (jkonecny)
+  Related: rhbz#1373449
+- Make the comments in payload and yumpayload consistent (jkonecny)
+  Related: rhbz#1373449
+- Fix Anaconda forces payload restart when network (not)change (jkonecny)
+  Resolves: rhbz#1358778
+  Resolves: rhbz#1373449
+- network: index team slave connection names starting with 1 (rvykydal)
+  Resolves: rhbz#1401403
+- network: fix --noipv4 via %%pre (rvykydal)
+  Resolves: rhbz#1418289
+
+* Thu Feb 02 2017 Radek Vykydal <rvykydal@redhat.com> - 21.48.22.95-1
+- Close connections to the yum database (vponcova)
+  Resolves: rhbz#1362427
+- network: fix --activate for bridge slaves configured via %%pre ks (rvykydal)
+  Resolves: rhbz#1416655
+- network: activate bridge for first network command in ks via %%pre (rvykydal)
+  Resolves: rhbz#1416655
+- network: unify slave connection names for ks %%pre with ks and gui (rvykydal)
+  Resolves: rhbz#1416655
+- network: respect --activate value for bridge from kickstart (rvykydal)
+  Resolves: rhbz#1416687
+
+* Mon Jan 30 2017  Radek Vykydal <rvykydal@redhat.com> - 21.48.22.94-1
+- network: bind slave connections to DEVICE, not HWADDR (rvykydal)
+  Related: rhbz#1373360
+- Catch race-condition error reading from in-memory connection being removed
+  (rvykydal)
+  Related: rhbz#1373360
+- Allow setting up bridge for fetching isntaller image from kickstart
+  (rvykydal)
+  Resolves: rhbz#1373360
 
 * Mon Sep 26 2016 Samantha N. Bueno <sbueno+anaconda@redhat.com> - 21.48.22.93-1
 - Accept any non-empty password in non-strict mode (mkolman)