diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index e93bbea6..00000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "libgsystem"]
-	path = libgsystem
-	url = git://git.gnome.org/libgsystem
diff --git a/Makefile-rpm-ostree.am b/Makefile-rpm-ostree.am
index 1f305354..89f692ec 100644
--- a/Makefile-rpm-ostree.am
+++ b/Makefile-rpm-ostree.am
@@ -23,8 +23,8 @@ rpm_ostree_SOURCES = src/rpm-ostree.c \
 	src/rpmostree-postprocess.h \
 	src/rpmostree-postprocess.c \
 	$(NULL)
-rpm_ostree_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/libgsystem -I$(srcdir)/src -DPKGLIBDIR=\"$(pkglibdir)\" $(PKGDEP_RPMOSTREE_CFLAGS)
-rpm_ostree_LDADD = $(AM_LDFLAGS) $(PKGDEP_RPMOSTREE_LIBS) libgsystem.la
+rpm_ostree_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/src -DPKGLIBDIR=\"$(pkglibdir)\" $(PKGDEP_RPMOSTREE_CFLAGS)
+rpm_ostree_LDADD = $(AM_LDFLAGS) $(PKGDEP_RPMOSTREE_LIBS)
 
 privdatadir=$(pkglibdir)
 privdata_DATA = src/tmpfiles-ostree-integration.conf
diff --git a/Makefile.am b/Makefile.am
index 027e82f6..9da9b123 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,21 +28,5 @@ AM_CFLAGS += $(WARN_CFLAGS)
 
 EXTRA_DIST += autogen.sh COPYING
 
-libgsystem_srcpath := libgsystem
-libgsystem_cflags = $(PKGDEP_GIO_UNIX_CFLAGS) -I$(srcdir)/libgsystem
-libgsystem_libs = $(PKGDEP_GIO_UNIX_LIBS)
-include libgsystem/Makefile-libgsystem.am
-privlib_LTLIBRARIES += libgsystem.la
-
-include $(INTROSPECTION_MAKEFILE)
-
 include Makefile-rpm-ostree.am
-include Makefile-gsystem-introspection.am
-
-girdir = $(pkgdatadir)/gir-1.0
-typelibdir = $(pkglibdir)/girepository-1.0
-
-gir_DATA = $(INTROSPECTION_GIRS)
-typelib_DATA = $(gir_DATA:.gir=.typelib)
-
 include Makefile-autobuilder.am
diff --git a/autogen.sh b/autogen.sh
index 1cac1cdf..9c97451c 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -15,14 +15,6 @@ fi
 
 mkdir -p m4
 
-# Fetch submodules if needed
-if test ! -f libgsystem/README;
-then
-  echo "+ Setting up submodules"
-  git submodule init
-  git submodule update
-fi
-
 autoreconf --force --install --verbose
 
 cd $olddir
diff --git a/configure.ac b/configure.ac
index 510266bb..eba1414e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,7 +32,7 @@ LT_INIT([disable-static])
 PKG_PROG_PKG_CONFIG
 
 PKG_CHECK_MODULES(PKGDEP_GIO_UNIX, [gio-unix-2.0])
-PKG_CHECK_MODULES(PKGDEP_RPMOSTREE, [gio-unix-2.0 ostree-1 libselinux])
+PKG_CHECK_MODULES(PKGDEP_RPMOSTREE, [gio-unix-2.0 ostree-1 libgsystem libselinux])
 AC_PATH_PROG([XSLTPROC], [xsltproc])
 
 GOBJECT_INTROSPECTION_REQUIRE([1.34.0])