diff --git a/patches/sbase.local.patch b/patches/sbase.local.patch
new file mode 100644
index 0000000..164feba
--- /dev/null
+++ b/patches/sbase.local.patch
@@ -0,0 +1,9 @@
+diff -ru sbase.orig/config.mk sbase/config.mk
+--- sbase.orig/config.mk	2017-10-17 18:50:00.118534627 +0200
++++ sbase/config.mk	2017-10-17 18:53:49.429001349 +0200
+@@ -13,4 +13,4 @@
+ # -lrt might be needed on some systems
+ CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_FILE_OFFSET_BITS=64
+ CFLAGS   = -std=c99 -Wall -pedantic
+-LDFLAGS  = -s
++LDFLAGS  =
diff --git a/patches/ubase.local.patch b/patches/ubase.local.patch
new file mode 100644
index 0000000..c95cfba
--- /dev/null
+++ b/patches/ubase.local.patch
@@ -0,0 +1,9 @@
+diff -ru ubase.orig/config.mk ubase/config.mk
+--- ubase.orig/config.mk	2017-10-17 18:59:11.582930570 +0200
++++ ubase/config.mk	2017-10-17 18:59:29.394818004 +0200
+@@ -12,4 +12,4 @@
+ CPPFLAGS = -D_FILE_OFFSET_BITS=64 -D_XOPEN_SOURCE=700 -D_GNU_SOURCE
+ CFLAGS   = -std=c99 -Wall -Wextra
+ LDLIBS   = -lcrypt
+-LDFLAGS  = -s
++LDFLAGS  =
diff --git a/vars/build.vars b/vars/build.vars
index 3630040..4201a0a 100644
--- a/vars/build.vars
+++ b/vars/build.vars
@@ -626,8 +626,8 @@ LEAF_PACKAGES_PACKAGES="
 apk_tools aria2 bash bc bdwgc bind bison chicken clang_host coreutils cparser cron dash datamash diffutils
 dos2unix dropbear ed figlet file findutils gawk git gnupg grep hexcurse htop inetutils infounzip infozip
 irssi john ldns less lighttpd flex lunix lynx make man_db mc mksh mtr m4 nano ncdu nginx openlitespeed openssh p7zip
-pacman patch patchutils perl procps_ng python3 qpdf rsync ruby rxvt_unicode sed smallbasic socat st tar tcsh
-the_silver_searcher tmux toilet util_linux vim weechat wget which whois xeyes xwd zsh";
+pacman patch patchutils perl procps_ng python3 qpdf rsync ruby rxvt_unicode sbase sed smallbasic socat st tar tcsh
+the_silver_searcher tmux toilet ubase util_linux vim weechat wget which whois xeyes xwd zsh";
 LEAF_PACKAGES_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_APK_TOOLS_SHA256SUM:=def2b2c23cd12fd2a9c19be49653b0d1bf9d81a26dac5a0ee79a1351d674f93b};
 : ${PKG_APK_TOOLS_VERSION:=2.6.8};
@@ -926,6 +926,10 @@ LEAF_PACKAGES_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_RXVT_UNICODE_VERSION:=9.22};
 : ${PKG_RXVT_UNICODE_URL:=http://dist.schmorp.de/rxvt-unicode/rxvt-unicode-${PKG_RXVT_UNICODE_VERSION}.tar.bz2};
 : ${PKG_RXVT_UNICODE_CONFIGURE_ARGS_EXTRA:=--disable-perl --disable-lastlog --disable-utmp --disable-wtmp};
+: ${PKG_SBASE_URLS_GIT:="sbase=http://git.suckless.org/sbase@master"};
+: ${PKG_SBASE_SUBDIR:=sbase};
+: ${PKG_SBASE_BUILD_DIR:=sbase};
+: ${PKG_SBASE_MAKEFLAGS_INSTALL:="DESTDIR=${PREFIX_NATIVE}/suckless PREFIX="};
 : ${PKG_SED_SHA256SUM:=cbd6ebc5aaf080ed60d0162d7f6aeae58211a1ee9ba9bb25623daa6cd942683b};
 : ${PKG_SED_VERSION:=4.4};
 : ${PKG_SED_URL:=https://ftp.gnu.org/gnu/sed/sed-${PKG_SED_VERSION}.tar.xz};
@@ -960,6 +964,10 @@ LEAF_PACKAGES_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_TOILET_SUBDIR:=toilet};
 : ${PKG_TOILET_ENV_VARS_EXTRA:="CACA_CFLAGS=-I${PREFIX_NATIVE}:CACA_LIBS=-L${PREFIX_NATIVE}/lib -lcaca"};
 : ${PKG_TOILET_CONFIGURE_ARGS_EXTRA:=--program-prefix=""};
+: ${PKG_UBASE_URLS_GIT:="ubase=http://git.suckless.org/ubase@master"};
+: ${PKG_UBASE_SUBDIR:=ubase};
+: ${PKG_UBASE_BUILD_DIR:=ubase};
+: ${PKG_UBASE_MAKEFLAGS_INSTALL:="DESTDIR=${PREFIX_NATIVE}/suckless PREFIX="};
 : ${PKG_UTIL_LINUX_SHA256SUM:=88bb1d08f0d67fb1b548c3e2160f7f40fb552cdf6b771a5dd1b94e1e04fc1d9a};
 : ${PKG_UTIL_LINUX_VERSION:=2.30.1};
 : ${PKG_UTIL_LINUX_URL:=https://www.kernel.org/pub/linux/utils/util-linux/v${PKG_UTIL_LINUX_VERSION%.*}/util-linux-${PKG_UTIL_LINUX_VERSION}.tar.gz};