diff --git a/document-portal/Makefile.am.inc b/document-portal/Makefile.am.inc
index 9b470ca6e..4205be3be 100644
--- a/document-portal/Makefile.am.inc
+++ b/document-portal/Makefile.am.inc
@@ -34,8 +34,8 @@ xdg_document_portal_SOURCES = \
 	document-portal/xdp-enums.h		\
 	document-portal/xdp-doc-db.h		\
 	document-portal/xdp-doc-db.c		\
-	document-portal/gvdb/gvdb-reader.c	\
-	document-portal/gvdb/gvdb-builder.c	\
+	lib/gvdb/gvdb-reader.c	\
+	lib/gvdb/gvdb-builder.c	\
 	$(xdp_dbus_built_sources)	\
 	document-portal/xdp-resources.h		\
 	document-portal/xdp-resources.c		\
diff --git a/document-portal/gvdb/.gitignore b/lib/gvdb/.gitignore
similarity index 100%
rename from document-portal/gvdb/.gitignore
rename to lib/gvdb/.gitignore
diff --git a/document-portal/gvdb/README b/lib/gvdb/README
similarity index 100%
rename from document-portal/gvdb/README
rename to lib/gvdb/README
diff --git a/document-portal/gvdb/gvdb-builder.c b/lib/gvdb/gvdb-builder.c
similarity index 100%
rename from document-portal/gvdb/gvdb-builder.c
rename to lib/gvdb/gvdb-builder.c
diff --git a/document-portal/gvdb/gvdb-builder.h b/lib/gvdb/gvdb-builder.h
similarity index 100%
rename from document-portal/gvdb/gvdb-builder.h
rename to lib/gvdb/gvdb-builder.h
diff --git a/document-portal/gvdb/gvdb-format.h b/lib/gvdb/gvdb-format.h
similarity index 100%
rename from document-portal/gvdb/gvdb-format.h
rename to lib/gvdb/gvdb-format.h
diff --git a/document-portal/gvdb/gvdb-reader.c b/lib/gvdb/gvdb-reader.c
similarity index 100%
rename from document-portal/gvdb/gvdb-reader.c
rename to lib/gvdb/gvdb-reader.c
diff --git a/document-portal/gvdb/gvdb-reader.h b/lib/gvdb/gvdb-reader.h
similarity index 100%
rename from document-portal/gvdb/gvdb-reader.h
rename to lib/gvdb/gvdb-reader.h
diff --git a/document-portal/gvdb/gvdb.doap b/lib/gvdb/gvdb.doap
similarity index 100%
rename from document-portal/gvdb/gvdb.doap
rename to lib/gvdb/gvdb.doap