diff --git a/toolbox.spec b/toolbox.spec
index d983724..0d604b8 100644
--- a/toolbox.spec
+++ b/toolbox.spec
@@ -27,6 +27,73 @@ Obsoletes:     fedora-toolbox < 0.0.5-2
 Toolbox is offers a familiar RPM based environment for developing and
 debugging software that runs fully unprivileged using Podman.
 
+# The list of requires packages for -support and -experience should be in sync with:
+# https://github.com/debarshiray/toolbox/blob/master/images/fedora/f31/extra-packages
+%package       support
+Summary:       Required packages for the container image to support %{name}
+
+# These are really required to make the image work with toolbox
+Requires:      passwd
+Requires:      shadow-utils
+Requires:      krb5-libs
+Requires:      vte-profile
+
+%description   support
+The %{name}-support package contains all the required packages that are needed
+to be installed in the container image to make it work with the %{name}.
+
+The %{name}-support package should be typically installed from the Dockerfile
+if the image isn't based on the fedora-toolbox image.
+
+
+%package       experience
+Summary:       Set of packages to enhance the %{name} experience
+
+Requires:      bash-completion
+Requires:      bzip2
+Requires:      diffutils
+Requires:      dnf-plugins-core
+Requires:      findutils
+Requires:      flatpak-xdg-utils
+Requires:      fpaste
+Requires:      git
+Requires:      gnupg
+Requires:      gnupg2-smime
+Requires:      hostname
+Requires:      iputils
+Requires:      jwhois
+Requires:      keyutils
+Requires:      less
+Requires:      lsof
+Requires:      man-db
+Requires:      man-pages
+Requires:      mlocate
+Requires:      mtr
+Requires:      openssh-clients
+Requires:      PackageKit-command-not-found
+Requires:      pigz
+Requires:      procps-ng
+Requires:      rsync
+Requires:      sudo
+Requires:      tcpdump
+Requires:      time
+Requires:      traceroute
+Requires:      tree
+Requires:      unzip
+Requires:      wget
+Requires:      which
+Requires:      words
+Requires:      xz
+Requires:      zip
+
+%description   experience
+The %{name}-experience package contains all the packages that should be
+installed in the container to provide the same default experience as working
+on the host.
+
+The %{name}-experience package should be typically installed from the
+Dockerfile if the image isn't based on the fedora-toolbox image.
+
 
 %prep
 %autosetup
@@ -54,6 +121,10 @@ debugging software that runs fully unprivileged using Podman.
 %{_mandir}/man1/%{name}-*.1*
 %{_tmpfilesdir}/%{name}.conf
 
+%files support
+
+%files experience
+
 
 %changelog
 * Thu Mar 14 2019 Debarshi Ray <rishi@fedoraproject.org> - 0.0.7-1