diff --git a/.gitignore b/.gitignore
index e22f394..2c973cb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-SOURCES/rpm-ostree-2015.11.tar.xz
+SOURCES/libhif.tar.gz
+SOURCES/rpm-ostree-2016.3.1.g5bd7211.tar.xz
diff --git a/.rpm-ostree.metadata b/.rpm-ostree.metadata
index 7717aa6..9964098 100644
--- a/.rpm-ostree.metadata
+++ b/.rpm-ostree.metadata
@@ -1 +1,2 @@
-63b8258337d5f42cbfa5263c302f0074f47ba37b SOURCES/rpm-ostree-2015.11.tar.xz
+c88de10d768aef159dfe56ae0fc46f65d7263958 SOURCES/libhif.tar.gz
+a8d96d36425c030ac8360f1a825c4d6b078860be SOURCES/rpm-ostree-2016.3.1.g5bd7211.tar.xz
diff --git a/SPECS/rpm-ostree.spec b/SPECS/rpm-ostree.spec
index 8dddac1..c561c7a 100644
--- a/SPECS/rpm-ostree.spec
+++ b/SPECS/rpm-ostree.spec
@@ -1,29 +1,61 @@
+%bcond_without bundled_libhif
 Summary: Client side upgrade program and server side compose tool
 Name: rpm-ostree
-Version: 2015.11
-Release: 2.atomic%{?dist}
+Version: 2016.3.1.g5bd7211
+Release: 1.atomic%{?dist}
 #VCS: https://github.com/cgwalters/rpm-ostree
 # This tarball is generated via "make -f Makefile.dist-packaging dist-snapshot"
+# because github doesn't support placing submodules in tarballs and RPM
+# doesn't understand git.
 Source0: rpm-ostree-%{version}.tar.xz
+# https://github.com/rpm-software-management/libhif
+# Bundled because the library is API/ABI unstable, and we're trying to
+# avoid being version locked with PackageKit/dnf right now.
+# This source is generated via
+#   git archive --format=tar --prefix=libhif/ 
+%if %{with bundled_libhif}
+Source1: libhif.tar.gz
+Provides: bundled(libhif) = 0.7.0
+%endif
 License: LGPLv2+
 URL: https://github.com/projectatomic/rpm-ostree
-BuildRequires: git
+
 # We always run autogen.sh
-BuildRequires: autoconf automake libtool
+BuildRequires: autoconf automake libtool git
 # For docs
+BuildRequires: chrpath
 BuildRequires: gtk-doc
 BuildRequires: gnome-common
+BuildRequires: gobject-introspection
+# Core requirements
 BuildRequires: pkgconfig(ostree-1) >= 2015.1
 BuildRequires: pkgconfig(libgsystem)
 BuildRequires: pkgconfig(json-glib-1.0)
-BuildRequires: pkgconfig(hawkey) >= 0.5.0
-BuildRequires: pkgconfig(libhif)
-BuildRequires: pkgconfig(hawkey)
 BuildRequires: pkgconfig(rpm)
+BuildRequires: pkgconfig(libarchive)
 BuildRequires: libcap-devel
 BuildRequires: libattr-devel
 
-Requires: ostree >= 2014.7
+# We currently interact directly with librepo
+BuildRequires: pkgconfig(librepo)
+
+# We're using RPATH to pick up our bundled version
+%global __requires_exclude ^libhif[.]so[.].*$
+
+%if %{with bundled_libhif}
+BuildRequires: cmake
+BuildRequires: pkgconfig(expat)
+BuildRequires: pkgconfig(check)
+BuildRequires: python-devel
+BuildRequires: python-sphinx
+%if (0%{?rhel} != 0 && 0%{?rhel} <= 7)
+BuildRequires: libsolv-devel
+%else
+BuildRequires: pkgconfig(libsolv)
+%endif
+%else
+BuildRequires: pkgconfig(libhif)
+%endif
 
 %description
 This tool binds together the world of RPM packages with the OSTree
@@ -40,13 +72,53 @@ The %{name}-devel package includes the header files for the %{name} library.
 
 %prep
 %autosetup -Sgit -n %{name}-%{version}
+%if %{with bundled_libhif}
+tar xf %{SOURCE1}
+%endif
 
 %build
+%if %{with bundled_libhif}
+(cd libhif
+ cmake \
+     -DCMAKE_INSTALL_PREFIX:PATH=%{_libexecdir}/rpm-ostree \
+     -DINCLUDE_INSTALL_DIR:PATH=%{_libexecdir}/rpm-ostree/include \
+     -DLIB_INSTALL_DIR:PATH=%{_libexecdir}/rpm-ostree \
+     -DSYSCONF_INSTALL_DIR:PATH=%{_libexecdir}/rpm-ostree/etc \
+     -DSHARE_INSTALL_PREFIX:PATH=%{_libexecdir}/rpm-ostree/share \
+     -DLIB_SUFFIX=64 \
+     -DBUILD_SHARED_LIBS:BOOL=ON .
+ make %{?_smp_mflags}
+ cat > libhif/libhif.pc<<EOF
+Name: libhif
+Description: Simple package manager interface and librepo
+Version: 
+Requires: glib-2.0, gobject-2.0, librepo, rpm
+Libs: -L$(pwd)/libhif -lhif
+Cflags: -I$(pwd) -I$(pwd)/libhif
+EOF
+)
+export PKG_CONFIG_PATH=$(pwd)/libhif/libhif${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}
+export LD_LIBRARY_PATH=$(pwd)/libhif/libhif${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+%endif
 env NOCONFIGURE=1 ./autogen.sh
-%configure --disable-silent-rules --enable-gtk-doc
+%configure --disable-silent-rules --enable-gtk-doc LDFLAGS='-Wl,-rpath=%{_libdir}/rpm-ostree'
 make %{?_smp_mflags}
 
 %install
+%if %{with bundled_libhif}
+(cd libhif
+ make install DESTDIR=$RPM_BUILD_ROOT
+ for path in %{_libdir}/python2.7 %{_libexecdir}/rpm-ostree/include %{_libexecdir}/rpm-ostree/pkg-config \
+	     %{_libexecdir}/rpm-ostree/share/man; do \
+     rm $RPM_BUILD_ROOT/${path} -rf; \
+ done
+ install -d $RPM_BUILD_ROOT/%{_libdir}/rpm-ostree
+ # Cherry pick the shared library...
+ mv $RPM_BUILD_ROOT/%{_libexecdir}/rpm-ostree/lib*/libhif*.so.* $RPM_BUILD_ROOT/%{_libdir}/rpm-ostree
+ # and nuke everything else.
+ rm $RPM_BUILD_ROOT/%{_libexecdir}/rpm-ostree -rf
+)
+%endif
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p -c"
 find $RPM_BUILD_ROOT -name '*.la' -delete
 
@@ -96,6 +168,12 @@ python autofiles.py > files.devel \
 %files devel -f files.devel
 
 %changelog
+* Tue Jun 14 2016 Colin Walters <walters@redhat.com> - 2016.3-3.atomic
+- New upstream version
+
+* Tue Apr 19 2016 Colin Walters <walters@redhat.com> - 2016.1-2.atomic
+- New upstream version
+
 * Tue Jan 12 2016 Colin Walters <walters@redhat.com> - 2015.11-2.atomic
 - New upstream version
   Resolves: #1291841