diff --git a/Makefile.am b/Makefile.am
index 78fb7b56..d91467b3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 AUTOMAKE_OPTIONS = foreign
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = libratbox
+SUBDIRS = librb
 
 if BUILD_LTDL
 SUBDIRS += libltdl
diff --git a/authd/Makefile.am b/authd/Makefile.am
index 6dac4f48..e1b705e1 100644
--- a/authd/Makefile.am
+++ b/authd/Makefile.am
@@ -1,7 +1,7 @@
 pkglibexec_PROGRAMS = authd
 AM_CFLAGS=$(WARNFLAGS)
-AM_CPPFLAGS = -I../include -I../libratbox/include 
+AM_CPPFLAGS = -I../include -I../librb/include 
 
 
 authd_SOURCES = authd.c res.c reslib.c dns.c
-authd_LDADD = ../libratbox/src/libratbox.la
+authd_LDADD = ../librb/src/librb.la
diff --git a/autogen.sh b/autogen.sh
index a317574a..175e0ff5 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -78,9 +78,9 @@ run_or_die ()
 
 parse_options "$@"
 
-echo "Building libratbox autotools files."
+echo "Building librb autotools files."
 
-cd "$TOP_DIR"/libratbox
+cd "$TOP_DIR"/librb
 bash autogen.sh
 
 echo "Building main autotools files."
diff --git a/bandb/Makefile.am b/bandb/Makefile.am
index 6b989b68..040451c1 100644
--- a/bandb/Makefile.am
+++ b/bandb/Makefile.am
@@ -2,15 +2,15 @@ pkglibexec_PROGRAMS = bandb
 bin_PROGRAMS = bantool
 AM_CFLAGS=$(WARNFLAGS)
 
-AM_CPPFLAGS = -I../include -I../libratbox/include @SQLITE_INCLUDES@
+AM_CPPFLAGS = -I../include -I../librb/include @SQLITE_INCLUDES@
 AM_CPPFLAGS += -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION
 
 bandb_SOURCES = bandb.c rsdb_sqlite3.c rsdb_snprintf.c
 EXTRA_bandb_SOURCES = sqlite3.c
-bandb_LDADD = ../libratbox/src/libratbox.la @SQLITE_LD@ @SQLITE_OBJ@
+bandb_LDADD = ../librb/src/librb.la @SQLITE_LD@ @SQLITE_OBJ@
 bandb_DEPENDENCIES = @SQLITE_OBJ@
 
 bantool_SOURCES = bantool.c rsdb_sqlite3.c rsdb_snprintf.c
 EXTRA_bantool_SOURCES = sqlite3.c
-bantool_LDADD = ../libratbox/src/libratbox.la @SQLITE_LD@ @SQLITE_OBJ@
+bantool_LDADD = ../librb/src/librb.la @SQLITE_LD@ @SQLITE_OBJ@
 bantool_DEPENDENCIES = @SQLITE_OBJ@
diff --git a/configure.ac b/configure.ac
index 731bb8e4..b542dac6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,7 +19,7 @@ fi
 AC_PREFIX_DEFAULT($HOME/ircd)
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADER(include/setup.h)
-AC_CONFIG_SUBDIRS([libratbox])
+AC_CONFIG_SUBDIRS([librb])
 AC_CONFIG_AUX_DIR([libltdl/config])
 
 AM_INIT_AUTOMAKE([subdir-objects])
diff --git a/extensions/Makefile.am b/extensions/Makefile.am
index e9c3cb4f..300c2195 100644
--- a/extensions/Makefile.am
+++ b/extensions/Makefile.am
@@ -1,7 +1,7 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/libratbox/include $(LTDLINCL)
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/librb/include $(LTDLINCL)
 AM_LDFLAGS  = -module -export-dynamic -avoid-version -no-undefined -shared
 AM_LDFLAGS += -export-symbols-regex _mheader
-LIBS += $(top_srcdir)/libratbox/src/libratbox.la $(top_srcdir)/ircd/libircd.la
+LIBS += $(top_srcdir)/librb/src/librb.la $(top_srcdir)/ircd/libircd.la
 
 extensiondir=@moduledir@/extensions
 
diff --git a/ircd/Makefile.am b/ircd/Makefile.am
index 9554f197..636140fa 100644
--- a/ircd/Makefile.am
+++ b/ircd/Makefile.am
@@ -3,8 +3,8 @@ AUTOMAKE_OPTIONS = foreign
 prefix		= @prefix@
 libircddir	= @libdir@
 
-AM_CPPFLAGS = @LTDLINCL@ -I$(top_srcdir)/include -I$(top_srcdir)/libratbox/include
-AM_LDFLAGS  = -L$(top_srcdir)/libratbox/src -export-dynamic -avoid-version -no-undefined
+AM_CPPFLAGS = @LTDLINCL@ -I$(top_srcdir)/include -I$(top_srcdir)/librb/include
+AM_LDFLAGS  = -L$(top_srcdir)/librb/src -export-dynamic -avoid-version -no-undefined
 AM_YFLAGS = -d
 
 BUILT_SOURCES = version.c
@@ -66,13 +66,13 @@ libircd_la_SOURCES =                  \
   version.c                     \
   whowas.c
 libircd_la_LDFLAGS = $(EXTRA_FLAGS) -avoid-version
-libircd_la_LIBADD = @LIBLTDL@ -L$(top_srcdir)/libratbox/src -lratbox
+libircd_la_LIBADD = @LIBLTDL@ -L$(top_srcdir)/librb/src -lratbox
 libircd_LTLIBRARIES = libircd.la
 
 bin_PROGRAMS = charybdis
 charybdis_SOURCES = main.c
 charybdis_LDFLAGS = $(EXTRA_FLAGS) -dlopen self
-charybdis_LDADD = libircd.la -L$(top_srcdir)/libratbox/src -lratbox
+charybdis_LDADD = libircd.la -L$(top_srcdir)/librb/src -lratbox
 
 install-exec-hook: install-libircdLTLIBRARIES
 	$(RM) -f version.c
diff --git a/libratbox/COPYING b/librb/COPYING
similarity index 100%
rename from libratbox/COPYING
rename to librb/COPYING
diff --git a/libratbox/CREDITS b/librb/CREDITS
similarity index 100%
rename from libratbox/CREDITS
rename to librb/CREDITS
diff --git a/libratbox/ChangeLog b/librb/ChangeLog
similarity index 100%
rename from libratbox/ChangeLog
rename to librb/ChangeLog
diff --git a/libratbox/INSTALL b/librb/INSTALL
similarity index 100%
rename from libratbox/INSTALL
rename to librb/INSTALL
diff --git a/libratbox/Makefile.am b/librb/Makefile.am
similarity index 72%
rename from libratbox/Makefile.am
rename to librb/Makefile.am
index 059cd80c..c8cb6fc2 100644
--- a/libratbox/Makefile.am
+++ b/librb/Makefile.am
@@ -3,4 +3,4 @@ AUTOMAKE_OPTIONS = foreign
 SUBDIRS = src
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libratbox.pc
+pkgconfig_DATA = librb.pc
diff --git a/libratbox/README b/librb/README
similarity index 100%
rename from libratbox/README
rename to librb/README
diff --git a/libratbox/TODO b/librb/TODO
similarity index 100%
rename from libratbox/TODO
rename to librb/TODO
diff --git a/libratbox/acinclude.m4 b/librb/acinclude.m4
similarity index 100%
rename from libratbox/acinclude.m4
rename to librb/acinclude.m4
diff --git a/libratbox/aclocal.m4 b/librb/aclocal.m4
similarity index 100%
rename from libratbox/aclocal.m4
rename to librb/aclocal.m4
diff --git a/libratbox/autogen.sh b/librb/autogen.sh
similarity index 100%
rename from libratbox/autogen.sh
rename to librb/autogen.sh
diff --git a/libratbox/config.guess b/librb/config.guess
similarity index 100%
rename from libratbox/config.guess
rename to librb/config.guess
diff --git a/libratbox/config.sub b/librb/config.sub
similarity index 100%
rename from libratbox/config.sub
rename to librb/config.sub
diff --git a/libratbox/configure b/librb/configure
similarity index 99%
rename from libratbox/configure
rename to librb/configure
index 14d1e660..be0d8aa9 100755
--- a/libratbox/configure
+++ b/librb/configure
@@ -15418,7 +15418,7 @@ ac_config_commands="$ac_config_commands include/librb-config.h"
 
 
 
-ac_config_files="$ac_config_files src/Makefile Makefile libratbox.pc"
+ac_config_files="$ac_config_files src/Makefile Makefile librb.pc"
 
 
 cat >confcache <<\_ACEOF
@@ -16523,7 +16523,7 @@ do
     "include/librb-config.h") CONFIG_COMMANDS="$CONFIG_COMMANDS include/librb-config.h" ;;
     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-    "libratbox.pc") CONFIG_FILES="$CONFIG_FILES libratbox.pc" ;;
+    "librb.pc") CONFIG_FILES="$CONFIG_FILES librb.pc" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
diff --git a/libratbox/configure.ac b/librb/configure.ac
similarity index 99%
rename from libratbox/configure.ac
rename to librb/configure.ac
index c2bbf773..b1f4c484 100644
--- a/libratbox/configure.ac
+++ b/librb/configure.ac
@@ -670,7 +670,7 @@ fi
 AC_CONFIG_FILES(		\
 	src/Makefile		\
 	Makefile		\
-	libratbox.pc
+	librb.pc
 )
 
 AC_OUTPUT
diff --git a/libratbox/include/arc4random.h b/librb/include/arc4random.h
similarity index 100%
rename from libratbox/include/arc4random.h
rename to librb/include/arc4random.h
diff --git a/libratbox/include/commio-int.h b/librb/include/commio-int.h
similarity index 100%
rename from libratbox/include/commio-int.h
rename to librb/include/commio-int.h
diff --git a/libratbox/include/commio-ssl.h b/librb/include/commio-ssl.h
similarity index 100%
rename from libratbox/include/commio-ssl.h
rename to librb/include/commio-ssl.h
diff --git a/libratbox/include/event-int.h b/librb/include/event-int.h
similarity index 100%
rename from libratbox/include/event-int.h
rename to librb/include/event-int.h
diff --git a/libratbox/include/libratbox_config.h.in b/librb/include/libratbox_config.h.in
similarity index 100%
rename from libratbox/include/libratbox_config.h.in
rename to librb/include/libratbox_config.h.in
diff --git a/libratbox/include/libratbox_config.h_vms b/librb/include/libratbox_config.h_vms
similarity index 100%
rename from libratbox/include/libratbox_config.h_vms
rename to librb/include/libratbox_config.h_vms
diff --git a/libratbox/include/ratbox_lib.h b/librb/include/ratbox_lib.h
similarity index 100%
rename from libratbox/include/ratbox_lib.h
rename to librb/include/ratbox_lib.h
diff --git a/libratbox/include/rb_balloc.h b/librb/include/rb_balloc.h
similarity index 100%
rename from libratbox/include/rb_balloc.h
rename to librb/include/rb_balloc.h
diff --git a/libratbox/include/rb_commio.h b/librb/include/rb_commio.h
similarity index 100%
rename from libratbox/include/rb_commio.h
rename to librb/include/rb_commio.h
diff --git a/libratbox/include/rb_event.h b/librb/include/rb_event.h
similarity index 100%
rename from libratbox/include/rb_event.h
rename to librb/include/rb_event.h
diff --git a/libratbox/include/rb_helper.h b/librb/include/rb_helper.h
similarity index 100%
rename from libratbox/include/rb_helper.h
rename to librb/include/rb_helper.h
diff --git a/libratbox/include/rb_linebuf.h b/librb/include/rb_linebuf.h
similarity index 100%
rename from libratbox/include/rb_linebuf.h
rename to librb/include/rb_linebuf.h
diff --git a/libratbox/include/rb_memory.h b/librb/include/rb_memory.h
similarity index 100%
rename from libratbox/include/rb_memory.h
rename to librb/include/rb_memory.h
diff --git a/libratbox/include/rb_patricia.h b/librb/include/rb_patricia.h
similarity index 100%
rename from libratbox/include/rb_patricia.h
rename to librb/include/rb_patricia.h
diff --git a/libratbox/include/rb_rawbuf.h b/librb/include/rb_rawbuf.h
similarity index 100%
rename from libratbox/include/rb_rawbuf.h
rename to librb/include/rb_rawbuf.h
diff --git a/libratbox/include/rb_tools.h b/librb/include/rb_tools.h
similarity index 100%
rename from libratbox/include/rb_tools.h
rename to librb/include/rb_tools.h
diff --git a/libratbox/include/serno.h b/librb/include/serno.h
similarity index 100%
rename from libratbox/include/serno.h
rename to librb/include/serno.h
diff --git a/libratbox/install-sh b/librb/install-sh
similarity index 100%
rename from libratbox/install-sh
rename to librb/install-sh
diff --git a/libratbox/libratbox.pc.in b/librb/librb.pc.in
similarity index 57%
rename from libratbox/libratbox.pc.in
rename to librb/librb.pc.in
index 16c4aacd..a2fd7da0 100644
--- a/libratbox/libratbox.pc.in
+++ b/librb/librb.pc.in
@@ -4,11 +4,11 @@ datarootdir=@datarootdir@
 data_dir=@datadir@/@PACKAGE_NAME@
 
 version=@PACKAGE_VERSION@
-include_dir=@includedir@/libratbox
+include_dir=@includedir@/librb
 lib_dir=@libdir@
 
-Name: libratbox
-Description: Portable runtime for ircd-ratbox and other things
+Name: librb
+Description: Portable runtime for charybdis and other things, based on libratbox
 Version: @PACKAGE_VERSION@
-Libs: -L${lib_dir} -lratbox
+Libs: -L${lib_dir} -lrb
 Cflags: -I${include_dir}
diff --git a/libratbox/ltmain.sh b/librb/ltmain.sh
similarity index 100%
rename from libratbox/ltmain.sh
rename to librb/ltmain.sh
diff --git a/libratbox/src/Makefile.am b/librb/src/Makefile.am
similarity index 75%
rename from libratbox/src/Makefile.am
rename to librb/src/Makefile.am
index 13284355..fb6c97b5 100644
--- a/libratbox/src/Makefile.am
+++ b/librb/src/Makefile.am
@@ -13,7 +13,7 @@ version.c: version.c.SH ../CREDITS
 version.lo: version.c ../include/serno.h
 	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
 
-libratbox_la_SOURCES =			\
+librb_la_SOURCES =			\
 	unix.c				\
 	win32.c				\
 	crypt.c				\
@@ -41,6 +41,6 @@ libratbox_la_SOURCES =			\
 	arc4random.c			\
 	version.c
 
-libratbox_la_LDFLAGS = @SSL_LIBS@ @GNUTLS_LIBS@ @MBEDTLS_LIBS@ -avoid-version -no-undefined -export-symbols export-syms.txt
-libratbox_la_LIBADD = @SSL_LIBS@ @GNUTLS_LIBS@ @MBEDTLS_LIBS@
-lib_LTLIBRARIES = libratbox.la
+librb_la_LDFLAGS = @SSL_LIBS@ @GNUTLS_LIBS@ @MBEDTLS_LIBS@ -avoid-version -no-undefined -export-symbols export-syms.txt
+librb_la_LIBADD = @SSL_LIBS@ @GNUTLS_LIBS@ @MBEDTLS_LIBS@
+lib_LTLIBRARIES = librb.la
diff --git a/libratbox/src/arc4random.c b/librb/src/arc4random.c
similarity index 100%
rename from libratbox/src/arc4random.c
rename to librb/src/arc4random.c
diff --git a/libratbox/src/balloc.c b/librb/src/balloc.c
similarity index 100%
rename from libratbox/src/balloc.c
rename to librb/src/balloc.c
diff --git a/libratbox/src/commio.c b/librb/src/commio.c
similarity index 100%
rename from libratbox/src/commio.c
rename to librb/src/commio.c
diff --git a/libratbox/src/crypt.c b/librb/src/crypt.c
similarity index 100%
rename from libratbox/src/crypt.c
rename to librb/src/crypt.c
diff --git a/libratbox/src/descrip.mms b/librb/src/descrip.mms
similarity index 100%
rename from libratbox/src/descrip.mms
rename to librb/src/descrip.mms
diff --git a/libratbox/src/devpoll.c b/librb/src/devpoll.c
similarity index 100%
rename from libratbox/src/devpoll.c
rename to librb/src/devpoll.c
diff --git a/libratbox/src/epoll.c b/librb/src/epoll.c
similarity index 100%
rename from libratbox/src/epoll.c
rename to librb/src/epoll.c
diff --git a/libratbox/src/event.c b/librb/src/event.c
similarity index 100%
rename from libratbox/src/event.c
rename to librb/src/event.c
diff --git a/libratbox/src/export-syms.txt b/librb/src/export-syms.txt
similarity index 100%
rename from libratbox/src/export-syms.txt
rename to librb/src/export-syms.txt
diff --git a/libratbox/src/gnutls.c b/librb/src/gnutls.c
similarity index 100%
rename from libratbox/src/gnutls.c
rename to librb/src/gnutls.c
diff --git a/libratbox/src/helper.c b/librb/src/helper.c
similarity index 100%
rename from libratbox/src/helper.c
rename to librb/src/helper.c
diff --git a/libratbox/src/kqueue.c b/librb/src/kqueue.c
similarity index 100%
rename from libratbox/src/kqueue.c
rename to librb/src/kqueue.c
diff --git a/libratbox/src/linebuf.c b/librb/src/linebuf.c
similarity index 100%
rename from libratbox/src/linebuf.c
rename to librb/src/linebuf.c
diff --git a/libratbox/src/mbedtls.c b/librb/src/mbedtls.c
similarity index 100%
rename from libratbox/src/mbedtls.c
rename to librb/src/mbedtls.c
diff --git a/libratbox/src/nossl.c b/librb/src/nossl.c
similarity index 100%
rename from libratbox/src/nossl.c
rename to librb/src/nossl.c
diff --git a/libratbox/src/openssl.c b/librb/src/openssl.c
similarity index 100%
rename from libratbox/src/openssl.c
rename to librb/src/openssl.c
diff --git a/libratbox/src/patricia.c b/librb/src/patricia.c
similarity index 100%
rename from libratbox/src/patricia.c
rename to librb/src/patricia.c
diff --git a/libratbox/src/poll.c b/librb/src/poll.c
similarity index 100%
rename from libratbox/src/poll.c
rename to librb/src/poll.c
diff --git a/libratbox/src/ports.c b/librb/src/ports.c
similarity index 100%
rename from libratbox/src/ports.c
rename to librb/src/ports.c
diff --git a/libratbox/src/ratbox_lib.c b/librb/src/ratbox_lib.c
similarity index 100%
rename from libratbox/src/ratbox_lib.c
rename to librb/src/ratbox_lib.c
diff --git a/libratbox/src/rawbuf.c b/librb/src/rawbuf.c
similarity index 100%
rename from libratbox/src/rawbuf.c
rename to librb/src/rawbuf.c
diff --git a/libratbox/src/rb_memory.c b/librb/src/rb_memory.c
similarity index 100%
rename from libratbox/src/rb_memory.c
rename to librb/src/rb_memory.c
diff --git a/libratbox/src/select.c b/librb/src/select.c
similarity index 100%
rename from libratbox/src/select.c
rename to librb/src/select.c
diff --git a/libratbox/src/sigio.c b/librb/src/sigio.c
similarity index 100%
rename from libratbox/src/sigio.c
rename to librb/src/sigio.c
diff --git a/libratbox/src/tools.c b/librb/src/tools.c
similarity index 100%
rename from libratbox/src/tools.c
rename to librb/src/tools.c
diff --git a/libratbox/src/unix.c b/librb/src/unix.c
similarity index 100%
rename from libratbox/src/unix.c
rename to librb/src/unix.c
diff --git a/libratbox/src/version.c.SH b/librb/src/version.c.SH
similarity index 100%
rename from libratbox/src/version.c.SH
rename to librb/src/version.c.SH
diff --git a/libratbox/src/win32.c b/librb/src/win32.c
similarity index 100%
rename from libratbox/src/win32.c
rename to librb/src/win32.c
diff --git a/modules/Makefile.am b/modules/Makefile.am
index 0475d084..539f94d7 100644
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -1,9 +1,9 @@
 AUTOMAKE_OPTIONS = subdir-objects
 
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/libratbox/include $(LTDLINCL)
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/librb/include $(LTDLINCL)
 AM_LDFLAGS  = -module -export-dynamic -avoid-version -no-undefined -shared
 AM_LDFLAGS += -export-symbols-regex _mheader
-LIBS += $(top_srcdir)/libratbox/src/libratbox.la $(top_srcdir)/ircd/libircd.la
+LIBS += $(top_srcdir)/librb/src/librb.la $(top_srcdir)/ircd/libircd.la
 
 auto_load_moddir=@moduledir@/autoload
 
diff --git a/ssld/Makefile.am b/ssld/Makefile.am
index 96db01bb..72837a2c 100644
--- a/ssld/Makefile.am
+++ b/ssld/Makefile.am
@@ -1,7 +1,7 @@
 pkglibexec_PROGRAMS = ssld
 AM_CFLAGS=$(WARNFLAGS)
-AM_CPPFLAGS = -I../include -I../libratbox/include 
+AM_CPPFLAGS = -I../include -I../librb/include 
 
 
 ssld_SOURCES = ssld.c
-ssld_LDADD = ../libratbox/src/libratbox.la @ZLIB_LD@
+ssld_LDADD = ../librb/src/librb.la @ZLIB_LD@
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 2d696813..44108212 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,6 +1,6 @@
 bin_PROGRAMS = charybdis-mkpasswd
 AM_CFLAGS=$(WARNFLAGS)
-AM_CPPFLAGS = $(DEFAULT_INCLUDES) -I../libratbox/include -I.
+AM_CPPFLAGS = $(DEFAULT_INCLUDES) -I../librb/include -I.
 
 charybdis_mkpasswd_SOURCES = mkpasswd.c
-charybdis_mkpasswd_LDADD = ../libratbox/src/libratbox.la
+charybdis_mkpasswd_LDADD = ../librb/src/librb.la