diff --git a/src/Makefile b/src/Makefile
index f5f2a22..ea1d0c8 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -16,12 +16,13 @@ ZLIB_CFLAGS		:= $(shell $(PKG_CONFIG) --cflags zlib)
 ZLIB_LIBS		:= $(shell $(PKG_CONFIG) --libs zlib)
 
 # Dynamic library
-libapk_soname		:= 3.12.0
+libapk_soname		:= 2.99.0
 libapk_so		:= $(obj)/libapk.so.$(libapk_soname)
 libapk.so.$(libapk_soname)-objs := \
-	adb.o common.o context.o crypto_openssl.o database.o package.o commit.o solver.o \
-	trust.o version.o atom.o blob.o hash.o print.o \
-	io.o io_url.o io_gunzip.o io_archive.o
+	adb.o adb_walk_adb.o adb_walk_genadb.o adb_walk_gentext.o adb_walk_istream.o apk_adb.o \
+	atom.o blob.o commit.o common.o context.o crypto_openssl.o database.o hash.o \
+	io.o io_url.o io_gunzip.o io_archive.o \
+	package.o pathbuilder.o print.o solver.o trust.o version.o
 
 libapk.so.$(libapk_soname)-libs := libfetch/libfetch.a
 
@@ -59,13 +60,12 @@ endif
 
 # Apk utility
 progs-y			+= apk
-apk-objs		:= apk.o applet.o \
-			   app_add.o app_del.o app_fix.o app_update.o app_upgrade.o \
-			   app_info.o app_list.o app_search.o app_manifest.o \
-			   app_policy.o app_stats.o \
-			   app_cache.o app_version.o \
-			   app_index.o app_fetch.o app_verify.o app_dot.o \
-			   app_audit.o
+apk-objs		:= \
+	apk.o app_adbdump.o app_adbsign.o app_add.o app_audit.o app_cache.o \
+	app_convdb.o app_convndx.o app_del.o app_dot.o app_extract.o app_fetch.o \
+	app_fix.o app_index.o app_info.o app_list.o app_manifest.o app_mkndx.o \
+	app_mkpkg.o app_policy.o app_update.o app_upgrade.o app_search.o \
+	app_stats.o app_verify.o app_version.o app_vertest.o applet.o
 
 ifeq ($(ADB),y)
 libapk.so.$(libapk_soname)-objs += apk_adb.o