diff --git a/xbps-digest/Makefile b/utils/Makefile
similarity index 100%
rename from xbps-digest/Makefile
rename to utils/Makefile
diff --git a/xbps-digest/xbps-digest.c b/utils/xbps-digest.c
similarity index 100%
rename from xbps-digest/xbps-digest.c
rename to utils/xbps-digest.c
diff --git a/xbps-pkgdb/xbps-pkgdb.c b/utils/xbps-pkgdb.c
similarity index 100%
rename from xbps-pkgdb/xbps-pkgdb.c
rename to utils/xbps-pkgdb.c
diff --git a/xbps-pkgdb/Makefile b/xbps-pkgdb/Makefile
deleted file mode 100644
index fc48dec1fdb..00000000000
--- a/xbps-pkgdb/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# Override PREFIX to look in correct path.
-#
-PREFIX	?= /usr/local
-CFLAGS	+= -Wall -Werror -I$(PREFIX)/include
-LDFLAGS	+= -lprop
-
-all: xbps-pkgdb
-
-xbps-pkgdb: xbps-pkgdb.o
-	$(CC) $(CFLAGS) $(LDFLAGS) $< -o $@
-
-clean:
-	-rm -f *.o *.core xbps-pkgdb