diff --git a/.centos-release.metadata b/.centos-release.metadata
index b7f7a0f..e69de29 100644
--- a/.centos-release.metadata
+++ b/.centos-release.metadata
@@ -1 +0,0 @@
-9e784270794c9f88af6c7bc46a02c07f4389d271 SOURCES/centos-release-8-0.1905.tar.gz
diff --git a/SOURCES/CentOS-Base.repo b/SOURCES/CentOS-Base.repo
new file mode 100644
index 0000000..f8babf3
--- /dev/null
+++ b/SOURCES/CentOS-Base.repo
@@ -0,0 +1,29 @@
+# CentOS-Base.repo
+#
+# The mirror system uses the connecting IP address of the client and the
+# update status of each mirror to pick mirrors that are updated to and
+# geographically close to the client.  You should use this for CentOS updates
+# unless you are manually picking other mirrors.
+#
+# If the mirrorlist= does not work for you, as a fall back you can try the
+# remarked out baseurl= line instead.
+#
+#
+
+[BaseOS]
+name=CentOS-$releasever - Base
+mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=os&infra=$infra
+#baseurl=http://mirror.centos.org/$contentdir/$releasever/os/$basearch/
+gpgcheck=1
+enabled=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
+
+#released updates
+[updates]
+name=CentOS-$releasever - Updates
+mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=updates&infra=$infra
+#baseurl=http://mirror.centos.org/$contentdir/$releasever/updates/$basearch/
+gpgcheck=1
+enabled=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
+
diff --git a/SOURCES/CentOS-CR.repo b/SOURCES/CentOS-CR.repo
new file mode 100644
index 0000000..3c883af
--- /dev/null
+++ b/SOURCES/CentOS-CR.repo
@@ -0,0 +1,29 @@
+# CentOS-CR.repo
+#
+# The Continuous Release ( CR )  repository contains rpms that are due in the next
+# release for a specific CentOS Version ( eg. next release in CentOS-8 ); these rpms
+# are far less tested, with no integration checking or update path testing having
+# taken place. They are still built from the upstream sources, but might not map
+# to an exact upstream distro release.
+#
+# These packages are made available soon after they are built, for people willing
+# to test their environments, provide feedback on content for the next release, and
+# for people looking for early-access to next release content.
+#
+# The CR repo is shipped in a disabled state by default; its important that users
+# understand the implications of turning this on.
+#
+# NOTE: We do not use a mirrorlist for the CR repos, to ensure content is available
+#       to everyone as soon as possible, and not need to wait for the external
+#       mirror network to seed first. However, many local mirrors will carry CR repos
+#       and if desired you can use one of these local mirrors by editing the baseurl
+#       line in the repo config below.
+#
+
+[cr]
+name=CentOS-$releasever - cr
+baseurl=http://mirror.centos.org/$contentdir/$releasever/cr/$basearch/
+gpgcheck=1
+enabled=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
+
diff --git a/SOURCES/CentOS-Debuginfo.repo b/SOURCES/CentOS-Debuginfo.repo
new file mode 100644
index 0000000..82c7811
--- /dev/null
+++ b/SOURCES/CentOS-Debuginfo.repo
@@ -0,0 +1,21 @@
+# CentOS-Debug.repo
+#
+# The mirror system uses the connecting IP address of the client and the
+# update status of each mirror to pick mirrors that are updated to and
+# geographically close to the client.  You should use this for CentOS updates
+# unless you are manually picking other mirrors.
+#
+
+# All debug packages from all the various CentOS-8 releases
+# are merged into a single repo, split by BaseArch
+#
+# Note: packages in the debuginfo repo are currently not signed
+#
+
+[base-debuginfo]
+name=CentOS - 8 - Debuginfo
+baseurl=http://debuginfo.centos.org/$releasever/$basearch/
+gpgcheck=1
+enabled=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
+
diff --git a/SOURCES/CentOS-Extras.repo b/SOURCES/CentOS-Extras.repo
new file mode 100644
index 0000000..80feed4
--- /dev/null
+++ b/SOURCES/CentOS-Extras.repo
@@ -0,0 +1,30 @@
+# CentOS-Extras.repo
+#
+# The mirror system uses the connecting IP address of the client and the
+# update status of each mirror to pick mirrors that are updated to and
+# geographically close to the client.  You should use this for CentOS updates
+# unless you are manually picking other mirrors.
+#
+# If the mirrorlist= does not work for you, as a fall back you can try the
+# remarked out baseurl= line instead.
+#
+#
+
+#additional packages that may be useful
+[extras]
+name=CentOS-$releasever - Extras
+mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=extras&infra=$infra
+#baseurl=http://mirror.centos.org/$contentdir/$releasever/extras/$basearch/
+gpgcheck=1
+enabled=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
+
+#additional packages that extend functionality of existing packages
+[centosplus]
+name=CentOS-$releasever - Plus
+mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=centosplus&infra=$infra
+#baseurl=http://mirror.centos.org/$contentdir/$releasever/centosplus/$basearch/
+gpgcheck=1
+enabled=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
+
diff --git a/SOURCES/CentOS-Media.repo b/SOURCES/CentOS-Media.repo
new file mode 100644
index 0000000..34bd1d8
--- /dev/null
+++ b/SOURCES/CentOS-Media.repo
@@ -0,0 +1,22 @@
+# CentOS-Media.repo
+#
+#  This repo can be used with mounted DVD media, verify the mount point for
+#  CentOS-8.  You can use this repo and yum to install items directly off the
+#  DVD ISO that we release.
+#
+# To use this repo, put in your DVD and use it with the other repos too:
+#  yum --enablerepo=c8-media [command]
+#
+# or for ONLY the media repo, do this:
+#
+#  yum --disablerepo=\* --enablerepo=c8-media [command]
+
+[c8-media]
+name=CentOS-$releasever - Media
+baseurl=file:///media/CentOS/
+        file:///media/cdrom/
+        file:///media/cdrecorder/
+gpgcheck=1
+enabled=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
+
diff --git a/SOURCES/CentOS-Sources.repo b/SOURCES/CentOS-Sources.repo
new file mode 100644
index 0000000..7687ccb
--- /dev/null
+++ b/SOURCES/CentOS-Sources.repo
@@ -0,0 +1,43 @@
+# CentOS-Sources.repo
+#
+# The mirror system uses the connecting IP address of the client and the
+# update status of each mirror to pick mirrors that are updated to and
+# geographically close to the client.  You should use this for CentOS updates
+# unless you are manually picking other mirrors.
+#
+# If the mirrorlist= does not work for you, as a fall back you can try the 
+# remarked out baseurl= line instead.
+#
+#
+
+[base-source]
+name=CentOS-$releasever - Base Sources
+baseurl=http://vault.centos.org/$contentdir/$releasever/os/Source/
+gpgcheck=1
+enabled=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
+
+#released updates 
+[updates-source]
+name=CentOS-$releasever - Updates Sources
+baseurl=http://vault.centos.org/$contentdir/$releasever/updates/Source/
+gpgcheck=1
+enabled=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
+
+#additional packages that may be useful
+[extras-source]
+name=CentOS-$releasever - Extras Sources
+baseurl=http://vault.centos.org/$contentdir/$releasever/extras/Source/
+gpgcheck=1
+enabled=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
+
+#additional packages that extend functionality of existing packages
+[centosplus-source]
+name=CentOS-$releasever - Plus Sources
+baseurl=http://vault.centos.org/$contentdir/$releasever/centosplus/Source/
+gpgcheck=1
+enabled=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
+
diff --git a/SOURCES/CentOS-Vault.repo b/SOURCES/CentOS-Vault.repo
new file mode 100644
index 0000000..cf48d2a
--- /dev/null
+++ b/SOURCES/CentOS-Vault.repo
@@ -0,0 +1,3 @@
+# CentOS Vault contains rpms from older releases in the CentOS-8
+# tree.
+
diff --git a/SOURCES/CentOS-fasttrack.repo b/SOURCES/CentOS-fasttrack.repo
new file mode 100644
index 0000000..dc51bcf
--- /dev/null
+++ b/SOURCES/CentOS-fasttrack.repo
@@ -0,0 +1,10 @@
+#CentOS-fasttrack.repo
+
+[fasttrack]
+name=CentOS - 8 - fasttrack
+mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=fasttrack&infra=$infra
+#baseurl=http://mirror.centos.org/$contentdir/$releasever/fasttrack/$basearch/
+gpgcheck=1
+enabled=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
+
diff --git a/SOURCES/Contributors b/SOURCES/Contributors
new file mode 100644
index 0000000..0369b02
--- /dev/null
+++ b/SOURCES/Contributors
@@ -0,0 +1,70 @@
+# -*- coding: utf-8 -*-
+
+The CentOS distribution would not be possible without the hard work and
+dedication of a large number of talented people. It's only fair that we
+acknowledge the time and effort that they have put into the distribution.
+
+We are always in need of more volunteers. If you're interested in joining
+the CentOS Project, please join us on irc.freenode.net in #centos-devel or 
+via the mailing list at http://lists.centos.org/pipermail/centos-devel/
+
+
+
+
+## Special Recognition ## 
+
+One of the key reasons we got delayed on the CentOS-6 release was lack of 
+suitable build resources, especially when we had to repeatedly build large
+chunks of code. Norwood S came forward and worked with me to 
+setup a large build machine, then tune the build process and help improve
+the overall build, test and validate process we were using. This build
+machine he donated to the project was about 5 times more capable than the
+entire buildsystem we had. And he did this out of his own pocket, from
+his own time, and has since upgraded the machine as well. It's now a 128GB,
+48 core machine, with 4 SSD's and 4 sata disks : but the key metric is 
+that it can build from source, the entire CentOS-7 distro in under 22 hrs.
+
+Having this capability was key in our ability to build, test and deliver
+CentOS-7 as rapidly as we have been able to.
+
+We'd like to dedicate the CentOS-7 Release to Mr Norwood S, of Phoenix,
+AZ, USA for his continued support for the project.
+
+Contributors:
+  The Red Hat developers, without whom CentOS would look very different
+
+  Akemi Matsuno-Yagi
+  Alain Reguera Delgado
+  Alan Bartlett
+  Andreas Thienemann
+  Anssi Johansson
+  Athmane Madjoudj
+  Bonnie King
+  Brian Stinson
+  Carl Trieloff
+  Christoph Galuschka
+  Fabian Arrotin
+  Jakub Filak
+  James Moger
+  Jeff Sheltren
+  Jim Perrin
+  Johnny Hughes Jr
+  Karanbir Singh
+  Karsten Wade
+  Kay Williams
+  Manuel Wolfshant
+  Matej Habrnal
+  Marcus Moeller
+  Michael Scherer
+  Mike McLean
+  Pablo Sebastián Greco
+  Pat Riehecky
+  Ralph Angenendt
+  Scott Robbins
+  Stephen John Smoogen
+  Trevor Hemsley
+  Tru Huynh
+  Tuomas Kuosmanen
+  Tuomo Soini
+  Tyler Parsons
+
diff --git a/SOURCES/EULA b/SOURCES/EULA
new file mode 100644
index 0000000..0e3bbdc
--- /dev/null
+++ b/SOURCES/EULA
@@ -0,0 +1,10 @@
+CentOS 8 Linux EULA
+
+CentOS 8 Linux comes with no guarantees or warranties of any sorts, 
+either written or implied.
+
+The Distribution is released as GPLv2. Individual packages in the
+distribution come with their own licences. A copy of the GPLv2 license
+is included with the distribution media.
+
+
diff --git a/SOURCES/GPL b/SOURCES/GPL
new file mode 100644
index 0000000..d159169
--- /dev/null
+++ b/SOURCES/GPL
@@ -0,0 +1,339 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                            NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    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, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
diff --git a/SOURCES/RPM-GPG-KEY-centosofficial b/SOURCES/RPM-GPG-KEY-centosofficial
new file mode 100644
index 0000000..30235a8
--- /dev/null
+++ b/SOURCES/RPM-GPG-KEY-centosofficial
@@ -0,0 +1,30 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+mQINBFzMWxkBEADHrskpBgN9OphmhRkc7P/YrsAGSvvl7kfu+e9KAaU6f5MeAVyn
+rIoM43syyGkgFyWgjZM8/rur7EMPY2yt+2q/1ZfLVCRn9856JqTIq0XRpDUe4nKQ
+8BlA7wDVZoSDxUZkSuTIyExbDf0cpw89Tcf62Mxmi8jh74vRlPy1PgjWL5494b3X
+5fxDidH4bqPZyxTBqPrUFuo+EfUVEqiGF94Ppq6ZUvrBGOVo1V1+Ifm9CGEK597c
+aevcGc1RFlgxIgN84UpuDjPR9/zSndwJ7XsXYvZ6HXcKGagRKsfYDWGPkA5cOL/e
+f+yObOnC43yPUvpggQ4KaNJ6+SMTZOKikM8yciyBwLqwrjo8FlJgkv8Vfag/2UR7
+JINbyqHHoLUhQ2m6HXSwK4YjtwidF9EUkaBZWrrskYR3IRZLXlWqeOi/+ezYOW0m
+vufrkcvsh+TKlVVnuwmEPjJ8mwUSpsLdfPJo1DHsd8FS03SCKPaXFdD7ePfEjiYk
+nHpQaKE01aWVSLUiygn7F7rYemGqV9Vt7tBw5pz0vqSC72a5E3zFzIIuHx6aANry
+Gat3aqU3qtBXOrA/dPkX9cWE+UR5wo/A2UdKJZLlGhM2WRJ3ltmGT48V9CeS6N9Y
+m4CKdzvg7EWjlTlFrd/8WJ2KoqOE9leDPeXRPncubJfJ6LLIHyG09h9kKQARAQAB
+tDpDZW50T1MgKENlbnRPUyBPZmZpY2lhbCBTaWduaW5nIEtleSkgPHNlY3VyaXR5
+QGNlbnRvcy5vcmc+iQI3BBMBAgAhBQJczFsZAhsDBgsJCAcDAgYVCAIJCgsDFgIB
+Ah4BAheAAAoJEAW1VbOEg8ZdjOsP/2ygSxH9jqffOU9SKyJDlraL2gIutqZ3B8pl
+Gy/Qnb9QD1EJVb4ZxOEhcY2W9VJfIpnf3yBuAto7zvKe/G1nxH4Bt6WTJQCkUjcs
+N3qPWsx1VslsAEz7bXGiHym6Ay4xF28bQ9XYIokIQXd0T2rD3/lNGxNtORZ2bKjD
+vOzYzvh2idUIY1DgGWJ11gtHFIA9CvHcW+SMPEhkcKZJAO51ayFBqTSSpiorVwTq
+a0cB+cgmCQOI4/MY+kIvzoexfG7xhkUqe0wxmph9RQQxlTbNQDCdaxSgwbF2T+gw
+byaDvkS4xtR6Soj7BKjKAmcnf5fn4C5Or0KLUqMzBtDMbfQQihn62iZJN6ZZ/4dg
+q4HTqyVpyuzMXsFpJ9L/FqH2DJ4exGGpBv00ba/Zauy7GsqOc5PnNBsYaHCply0X
+407DRx51t9YwYI/ttValuehq9+gRJpOTTKp6AjZn/a5Yt3h6jDgpNfM/EyLFIY9z
+V6CXqQQ/8JRvaik/JsGCf+eeLZOw4koIjZGEAg04iuyNTjhx0e/QHEVcYAqNLhXG
+rCTTbCn3NSUO9qxEXC+K/1m1kaXoCGA0UWlVGZ1JSifbbMx0yxq/brpEZPUYm+32
+o8XfbocBWljFUJ+6aljTvZ3LQLKTSPW7TFO+GXycAOmCGhlXh2tlc6iTc41PACqy
+yy+mHmSv
+=kkH7
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/SOURCES/RPM-GPG-KEY-centostesting b/SOURCES/RPM-GPG-KEY-centostesting
new file mode 100644
index 0000000..635206d
--- /dev/null
+++ b/SOURCES/RPM-GPG-KEY-centostesting
@@ -0,0 +1,30 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+mQINBFzMYBIBEACzbPN6Yso1qkcpVTnpfUxVWUpcWcuMiWpKSsZKkT2k9nOVVc7v
+aaLUkKY1WoD3+FoE8fDReTgiwbGFyB9EVC2erwjqQsVr6x7ntVjxX5eFniRZ3O1+
+ez3mBWhTfAXo7QoobZPnGeh8eL+lI2Yli/bf3gFGYB9xmv/WptokwvN379XtjP3F
+eFfHlCDpBEWL4ISZ4V6BRlIspnWd8A2FbV3byK5DMiKLpU/qnSPcXY4/OfWwn4HK
+Of/RFqOJZrJgy2HEmf3XDFHbg7OiGr80Fsc2UuSBQo5MkXckpBVAF7QmhGoRC4V0
+5xgr2Z5Lh2OZhMtLJDYolvrNcdyNvjcfri6QYS55dBpctNbG49OMmw+niy5uJ0KA
+MTXPNmyQ3Xtz3Smh8T6yj8iPyHkF7g2JC2xUzp6zijwDjRrDtGpnhrCmOPVlQAph
+Os6prHwDa3N3OFubKhFscftkjAElgHVb97U6gabU9BJsLPcMV+HkW3sm8nx2Q9eh
+Ew5CfvirSI8RFifOpDid99KSo/Id+wrTqW10Q/wfyFcGkrKo1fVpEkkDGc1nWKQS
++K5MMQsyweohFQvy+yKX2LXhYjDBpopd4KKZJNhR+UDncD7shaKM2yIUp11W7Oe1
+DkeXME7GvGiB48Trcz38osYTzCqxvzXegFQ01PuiYdxjnYZfWlcl3xaUKwARAQAB
+tD1DZW50T1MgVGVzdGluZyAoQ2VudE9TIFRlc3RpbmcgY29udGVudCkgPHNlY3Vy
+aXR5QGNlbnRvcy5vcmc+iQI3BBMBAgAhBQJczGASAhsDBgsJCAcDAgYVCAIJCgsD
+FgIBAh4BAheAAAoJEHYuZYVbpfqNL1gP/jeWOFd7Pcn8FxLQl3IVheHe/5U0z+FO
+0rkmr1aLTzoO2Os22DXvcXHHMRxFXjE/xDA8SDp8hNtiU5o7t6z0ZDaDrFo2Cap2
+8MEqhSmDFmezBEV70xaKHtWTkupf4PYZkGzv8flGeOSjVsjN/KaCvWs5n4fq5nTE
+Vk2HdxUsXNso8+Z80MqAbtoFYQi63LeRW7pT3D3Y4vCLpjihJwWLYHJrhFvt1WHo
+g7az6JoEeHL5lgcOnTt8OsveZk3ih9cONzmlnaRJaaoo6Y7CdtbPu6dVGhRTySto
+fZ1MCTrhqZ/Pn8Vgda6kPGq69UcbQ2XvDrHt1q/mLvJsgPY+3E5jgU2buo3YaUfB
+Yb9b8ExNpeNCNbxz45FXw6JymtC+YvRipThptuigUngAY+Lpp0ibF/U5Qwox8w/7
+BnTcmT/lh3bGZH3AvWJpflD/WN2qplhXU5KsGIyyFTxGA8bXtbYTnMCwL7XpwXPa
+GfMdI/anERDd6l4dxOFWGkLcwZ8PmkLCH52EgPWyd403LPSoukVmupJ42D3hSE7e
+9l7FU2hsX5E00zsKTbE7EBUUsP67Ah9N2w3DaEE8XxMCikLN5ok012OjIIQGOEoK
+aK0K9fVkSyrpIacOQ0k3wBDuKpYYTsRRi+yS8oTfUO+ExM09SlqElyvnKntar18l
+H5XnTNztBtX9
+=p0y+
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/SPECS/centos-release.spec b/SPECS/centos-release.spec
index 1e26fe1..9d1ee90 100644
--- a/SPECS/centos-release.spec
+++ b/SPECS/centos-release.spec
@@ -2,19 +2,17 @@
 %define product_family CentOS Linux
 %define variant_titlecase Server
 %define variant_lowercase server
-%ifarch %{ix86}
-%define targetdir x86_64
-%else
-%define targetdir %{_target_cpu}
-%endif
 %ifarch %{arm}
 %define release_name AltArch
+%define contentdir   altarch
 %else
 %define release_name Core
+%define contentdir   centos
 %endif
 %ifarch ppc64le
 %define tuned_profile :server
 %endif
+%define infra_var stock
 %define base_release_version 8
 %define full_release_version 8
 %define dist_release_version 8
@@ -24,13 +22,15 @@
 #define beta Beta
 %define dist .el%{dist_release_version}
 
+# The anaconda scripts in %{_libexecdir} can create false requirements
+%global __requires_exclude_from %{_libexecdir}
+
 Name:           centos-release
-Version:        %{base_release_version}
+Version:        %{upstream_rel}
 Release:        %{centos_rel}.0.4%{?dist}
 Summary:        %{product_family} release file
 Group:          System Environment/Base
 License:        GPLv2
-Requires(post): coreutils, grep
 %ifnarch %{arm}
 %define pkg_name %{name}
 %else
@@ -48,14 +48,28 @@ Provides:       system-release(releasever) = %{base_release_version}
 Provides:       centos-release-eula
 Provides:       redhat-release-eula
 
-Source0:        centos-release-%{base_release_version}-%{centos_rel}.tar.gz
 Source1:        85-display-manager.preset
 Source2:        90-default.preset
 Source3:        99-default-disable.preset
+Source10:       RPM-GPG-KEY-centosofficial
+Source11:       RPM-GPG-KEY-centostesting
 
 Source99:       update-boot
 Source100:      rootfs-expand
 
+Source200:      EULA
+Source201:      GPL
+Source202:      Contributors
+
+Source300:      CentOS-Base.repo
+Source301:      CentOS-CR.repo
+Source302:      CentOS-Debuginfo.repo
+Source303:      CentOS-Extras.repo
+Source304:      CentOS-fasttrack.repo
+Source305:      CentOS-Media.repo
+Source306:      CentOS-Sources.repo
+Source307:      CentOS-Vault.repo
+
 %ifarch %{arm}
 %description -n %{pkg_name}
 %{product_family} release files
@@ -65,7 +79,7 @@ Source100:      rootfs-expand
 %{product_family} release files
 
 %prep
-%setup -q -n centos-release-%{base_release_version}
+echo OK
 
 %build
 echo OK
@@ -91,18 +105,18 @@ ID_LIKE="rhel fedora"
 VERSION_ID="%{full_release_version}"
 PRETTY_NAME="%{product_family} %{full_release_version} (%{release_name})"
 ANSI_COLOR="0;31"
-CPE_NAME="cpe:/o:centos:centos:8%{?tuned_profile}"
+CPE_NAME="cpe:/o:centos:centos:%{base_release_version}%{?tuned_profile}"
 HOME_URL="https://www.centos.org/"
 BUG_REPORT_URL="https://bugs.centos.org/"
 
-CENTOS_MANTISBT_PROJECT="CentOS-8"
-CENTOS_MANTISBT_PROJECT_VERSION="8"
+CENTOS_MANTISBT_PROJECT="CentOS-%{base_release_version}"
+CENTOS_MANTISBT_PROJECT_VERSION="%{base_release_version}"
 REDHAT_SUPPORT_PRODUCT="centos"
-REDHAT_SUPPORT_PRODUCT_VERSION="8"
+REDHAT_SUPPORT_PRODUCT_VERSION="%{base_release_version}"
 
 EOF
 # write cpe to /etc/system/release-cpe
-echo "cpe:/o:centos:centos:8" > %{buildroot}/etc/system-release-cpe
+echo "cpe:/o:centos:centos:%{base_release_version}" > %{buildroot}/etc/system-release-cpe
 
 # create /etc/issue and /etc/issue.net
 echo '\S' > %{buildroot}/etc/issue
@@ -110,25 +124,28 @@ echo 'Kernel \r on an \m' >> %{buildroot}/etc/issue
 cp %{buildroot}/etc/issue %{buildroot}/etc/issue.net
 echo >> %{buildroot}/etc/issue
 
-pushd %{targetdir}
 # copy GPG keys
 mkdir -p -m 755 %{buildroot}/etc/pki/rpm-gpg
-for file in RPM-GPG-KEY* ; do
-    install -m 644 $file %{buildroot}/etc/pki/rpm-gpg
-done
+install -m 644 %{SOURCE10} %{buildroot}/etc/pki/rpm-gpg
+install -m 644 %{SOURCE11} %{buildroot}/etc/pki/rpm-gpg
 
 # copy yum repos
 mkdir -p -m 755 %{buildroot}/etc/yum.repos.d
-for file in CentOS-*.repo; do 
-    install -m 644 $file %{buildroot}/etc/yum.repos.d
-done
-
-mkdir -p -m 755 %{buildroot}/etc/yum/vars
-install -m 0644 yum-vars-infra %{buildroot}/etc/yum/vars/infra
+install -m 644 %{SOURCE300} %{buildroot}/etc/yum.repos.d
+install -m 644 %{SOURCE301} %{buildroot}/etc/yum.repos.d
+install -m 644 %{SOURCE302} %{buildroot}/etc/yum.repos.d
+install -m 644 %{SOURCE303} %{buildroot}/etc/yum.repos.d
+install -m 644 %{SOURCE304} %{buildroot}/etc/yum.repos.d
+install -m 644 %{SOURCE305} %{buildroot}/etc/yum.repos.d
+install -m 644 %{SOURCE306} %{buildroot}/etc/yum.repos.d
+install -m 644 %{SOURCE307} %{buildroot}/etc/yum.repos.d
+
+mkdir -p -m 755 %{buildroot}/etc/dnf/vars
+echo "%{infra_var}" > %{buildroot}/etc/dnf/vars/infra
+echo "%{contentdir}" >%{buildroot}/etc/dnf/vars/contentdir
 %ifarch %{arm}
-install -m 0644 yum-vars-releasever %{buildroot}/etc/yum/vars/releasever
+echo %{base_release_version} > %{buildroot}/etc/dnf/vars/releasever
 %endif
-popd
 
 # set up the dist tag macros
 install -d -m 755 %{buildroot}/etc/rpm
@@ -138,20 +155,20 @@ cat >> %{buildroot}/etc/rpm/macros.dist << EOF
 %%centos_ver %{base_release_version}
 %%centos %{base_release_version}
 %%rhel %{base_release_version}
-%%dist .el8
+%%dist .el%{base_release_version}
 %%el%{base_release_version} 1
 EOF
 
 # use unbranded datadir
 mkdir -p -m 755 %{buildroot}/%{_datadir}/centos-release
 ln -s centos-release %{buildroot}/%{_datadir}/redhat-release
-install -m 644 EULA %{buildroot}/%{_datadir}/centos-release
+install -m 644 %{SOURCE200} %{buildroot}/%{_datadir}/centos-release
 
 # use unbranded docdir
 mkdir -p -m 755 %{buildroot}/%{_docdir}/centos-release
 ln -s centos-release %{buildroot}/%{_docdir}/redhat-release
-install -m 644 GPL %{buildroot}/%{_docdir}/centos-release
-install -m 644 Contributors %{buildroot}/%{_docdir}/centos-release
+install -m 644 %{SOURCE201} %{buildroot}/%{_docdir}/centos-release
+install -m 644 %{SOURCE202} %{buildroot}/%{_docdir}/centos-release
 
 # copy systemd presets
 mkdir -p %{buildroot}/%{_prefix}/lib/systemd/system-preset/
@@ -166,16 +183,6 @@ install -m 0755 %{SOURCE99} %{buildroot}%{_bindir}/
 install -m 0755 %{SOURCE100} %{buildroot}%{_bindir}/
 %endif
 
-%posttrans -n %{pkg_name}
-%ifarch %{arm}
-if [ -e /usr/local/bin/rootfs-expand ];then
-rm -f /usr/local/bin/rootfs-expand
-fi
-echo 'altarch' >/etc/yum/vars/contentdir
-%else
-echo 'centos' > /etc/yum/vars/contentdir
-%endif
-
 
 %clean
 rm -rf %{buildroot}
@@ -192,7 +199,7 @@ rm -rf %{buildroot}
 %config(noreplace) /etc/issue.net
 /etc/pki/rpm-gpg/
 %config(noreplace) /etc/yum.repos.d/*
-%config(noreplace) /etc/yum/vars/*
+%config(noreplace) /etc/dnf/vars/*
 /etc/rpm/macros.dist
 %{_docdir}/redhat-release
 %{_docdir}/centos-release/*