diff --git a/gnome-backgrounds.spec b/gnome-backgrounds.spec
index 4ab8647..a0b4792 100644
--- a/gnome-backgrounds.spec
+++ b/gnome-backgrounds.spec
@@ -1,23 +1,34 @@
 Name: gnome-backgrounds
 Version: 3.24.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Desktop backgrounds packaged with the GNOME desktop
 
 License: GPLv2
 URL: http://www.gnome.org
 Source0: https://download.gnome.org/sources/%{name}/3.24/%{name}-%{version}.tar.xz
 
+Patch0: move-adwaita-backgrounds.patch
+
 BuildArch: noarch
 BuildRequires: intltool
 BuildRequires: gettext
 
 %description
-The gnome-backgrounds package contains images and tiles
-to use for your desktop background which are packaged
-with the GNOME desktop.
+The gnome-backgrounds package contains the default
+desktop background, known as the Adwaita background,
+for the GNOME Desktop version
+
+%package        extras
+Summary:        Additional GNOME Backgrounds
+License:        GPLv2
+
+%description    extras
+This package contains the additional desktop backgrounds
+which are packaged with the GNOME desktop.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure
@@ -34,10 +45,38 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/locale
 %files
 %license COPYING
 %doc NEWS README AUTHORS
-%{_datadir}/gnome-background-properties
-%{_datadir}/backgrounds/*
+%{_datadir}/gnome-background-properties/adwaita.xml
+%{_datadir}/backgrounds/gnome/adwaita-day.jpg
+%{_datadir}/backgrounds/gnome/adwaita-lock.jpg
+%{_datadir}/backgrounds/gnome/adwaita-morning.jpg
+%{_datadir}/backgrounds/gnome/adwaita-night.jpg
+%{_datadir}/backgrounds/gnome/adwaita-timed.xml
+
+%files extras
+%license COPYING
+%doc NEWS README AUTHORS
+%{_datadir}/gnome-background-properties/gnome-backgrounds.xml
+%{_datadir}/backgrounds/gnome/Bokeh_Tails.jpg
+%{_datadir}/backgrounds/gnome/Chmiri.jpg
+%{_datadir}/backgrounds/gnome/Dark_Ivy.jpg
+%{_datadir}/backgrounds/gnome/Fabric.jpg
+%{_datadir}/backgrounds/gnome/Flowerbed.jpg
+%{_datadir}/backgrounds/gnome/Godafoss_Iceland.jpg
+%{_datadir}/backgrounds/gnome/Icescape.jpg
+%{_datadir}/backgrounds/gnome/Mirror.jpg
+%{_datadir}/backgrounds/gnome/Road.jpg
+%{_datadir}/backgrounds/gnome/Sandstone.jpg
+%{_datadir}/backgrounds/gnome/Stones.jpg
+%{_datadir}/backgrounds/gnome/Terraform-green.jpg
+%{_datadir}/backgrounds/gnome/Waterfalls.jpg
+%{_datadir}/backgrounds/gnome/Waves.jpg
+
 
 %changelog
+* Wed May 10 2017 Ryan Lerch <rlerch@redhat.com> - 3.24.0-2
+- Split the package into gnome-backgrounds for the default adwaita background,
+  and gnome-backgrounds-extras for the other standard GNOME wallpapers.
+
 * Tue Mar 21 2017 Kalev Lember <klember@redhat.com> - 3.24.0-1
 - Update to 3.24.0
 
@@ -290,4 +329,3 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/locale
 
 * Mon Jan 31 2005 Matthias Clasen <mclasen@redhat.com> - 2.9.90-1
 - Initial build.
-
diff --git a/move-adwaita-backgrounds.patch b/move-adwaita-backgrounds.patch
new file mode 100644
index 0000000..e95576c
--- /dev/null
+++ b/move-adwaita-backgrounds.patch
@@ -0,0 +1,45 @@
+diff -ruw gnome-backgrounds-3.24.0/backgrounds/adwaita.xml.in.in gnome-backgrounds-3.24.0-new/backgrounds/adwaita.xml.in.in
+--- gnome-backgrounds-3.24.0/backgrounds/adwaita.xml.in.in	2014-11-27 05:00:42.000000000 +1000
++++ gnome-backgrounds-3.24.0-new/backgrounds/adwaita.xml.in.in	2017-05-10 12:22:50.730448428 +1000
+@@ -9,4 +9,13 @@
+     <pcolor>#3465a4</pcolor>
+     <scolor>#000000</scolor>
+   </wallpaper>
++  <wallpaper deleted="false">
++    <!-- TRANSLATORS: This is the name of this background picture: http://git.gnome.org/browse/gnome-backgrounds/plain/backgrounds/adwaita-night.jpg -
++    You might want to translate it into the equivalent words of your language  -->
++    <_name>Lock Screen</_name>
++    <filename>@datadir@/backgrounds/gnome/adwaita-lock.jpg</filename>
++    <options>zoom</options>
++    <pcolor>#ffffff</pcolor>
++    <scolor>#000000</scolor>
++  </wallpaper>
+ </wallpapers>
+diff -ruw gnome-backgrounds-3.24.0/backgrounds/gnome-backgrounds.xml.in.in gnome-backgrounds-3.24.0-new/backgrounds/gnome-backgrounds.xml.in.in
+--- gnome-backgrounds-3.24.0/backgrounds/gnome-backgrounds.xml.in.in	2016-09-01 21:56:13.000000000 +1000
++++ gnome-backgrounds-3.24.0-new/backgrounds/gnome-backgrounds.xml.in.in	2017-05-10 11:21:00.072499917 +1000
+@@ -65,24 +65,6 @@
+     <scolor>#000000</scolor>
+ 	</wallpaper>
+ 	<wallpaper deleted="false">
+-		<!-- TRANSLATORS: This is the name of this background picture: http://git.gnome.org/browse/gnome-backgrounds/plain/backgrounds/adwaita-morning.jpg - 
+-		You might want to translate it into the equivalent words of your language  -->
+-		<_name>Adwaita</_name>
+-		<filename>@BACKGROUNDDIR@/adwaita-timed.xml</filename>
+-		<options>zoom</options>
+-    <pcolor>#ffffff</pcolor>
+-    <scolor>#000000</scolor>
+-	</wallpaper>
+-	<wallpaper deleted="false">
+-		<!-- TRANSLATORS: This is the name of this background picture: http://git.gnome.org/browse/gnome-backgrounds/plain/backgrounds/adwaita-night.jpg - 
+-		You might want to translate it into the equivalent words of your language  -->
+-		<_name>Lock Screen</_name>
+-		<filename>@BACKGROUNDDIR@/adwaita-lock.jpg</filename>
+-		<options>zoom</options>
+-    <pcolor>#ffffff</pcolor>
+-    <scolor>#000000</scolor>
+-	</wallpaper>
+-		<wallpaper deleted="false">
+ 		<!-- TRANSLATORS: This is the name of this background picture: http://git.gnome.org/browse/gnome-backgrounds/plain/backgrounds/Mirror.jpg - 
+ 		You might want to translate it into the equivalent words of your language  -->
+ 		<_name>Mirror</_name>