diff --git a/NEWS b/NEWS
index e78b0f9..79628d7 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+- Updated for bglibs v2
+-------------------------------------------------------------------------------
 Changes in version 2.10
 
 - Added new "rbl" plugin, to block messages from IPs in an RBL.
diff --git a/README.in b/README.in
index 6eb5195..fcf14fd 100644
--- a/README.in
+++ b/README.in
@@ -26,8 +26,8 @@ Development versions of @PACKAGE@ are available at:
 
 Requirements:
 
-- bglibs version 1.101
-- cvm version 0.82
+- bglibs version 2.01
+- cvm version 0.97
 - Lua version 5 or later (optional)
 
 Installation:
diff --git a/backend-echo.c b/backend-echo.c
index bc2e0c7..5312ef6 100644
--- a/backend-echo.c
+++ b/backend-echo.c
@@ -1,9 +1,9 @@
-#include <sysdeps.h>
+#include <bglibs/sysdeps.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#include <msg/msg.h>
-#include <str/iter.h>
+#include <bglibs/msg.h>
+#include <bglibs/striter.h>
 #include "mailfront.h"
 
 static response resp = { 250, 0 };
diff --git a/backend-qmail.c b/backend-qmail.c
index daacc1f..9f558cf 100644
--- a/backend-qmail.c
+++ b/backend-qmail.c
@@ -1,12 +1,12 @@
-#include <sysdeps.h>
+#include <bglibs/sysdeps.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
 #include <unistd.h>
-#include <misc/misc.h>
-#include <msg/msg.h>
-#include <unix/sig.h>
+#include <bglibs/misc.h>
+#include <bglibs/msg.h>
+#include <bglibs/sig.h>
 #include "mailfront.h"
 #include "conf_qmail.c"
 
diff --git a/backend-queuedir.c b/backend-queuedir.c
index d79af73..6001f1b 100644
--- a/backend-queuedir.c
+++ b/backend-queuedir.c
@@ -1,14 +1,14 @@
 #include "mailfront.h"
 
-#include <sysdeps.h>
-#include <systime.h>
+#include <bglibs/sysdeps.h>
+#include <bglibs/systime.h>
 #include <errno.h>
 #include <unistd.h>
 #include <sys/stat.h>
 
-#include <iobuf/iobuf.h>
-#include <path/path.h>
-#include <str/str.h>
+#include <bglibs/iobuf.h>
+#include <bglibs/path.h>
+#include <bglibs/str.h>
 
 static str destpath;
 static str temppath;
diff --git a/getprotoenv.c b/getprotoenv.c
index df59084..b29ce97 100644
--- a/getprotoenv.c
+++ b/getprotoenv.c
@@ -1,7 +1,7 @@
-#include <systime.h>
+#include <bglibs/systime.h>
 #include <stdlib.h>
-#include <msg/msg.h>
-#include <msg/wrap.h>
+#include <bglibs/msg.h>
+#include <bglibs/wrap.h>
 #include "mailfront.h"
 
 static const char* proto;
diff --git a/imapfront-auth.c b/imapfront-auth.c
index 56b3671..37f2046 100644
--- a/imapfront-auth.c
+++ b/imapfront-auth.c
@@ -22,7 +22,7 @@
  * http://www.FutureQuest.net/
  * ossi@FutureQuest.net
  */
-#include <sysdeps.h>
+#include <bglibs/sysdeps.h>
 #include <ctype.h>
 #include <stdlib.h>
 #include <string.h>
@@ -30,8 +30,8 @@
 #include <sys/stat.h>
 #include <cvm/sasl.h>
 #include <cvm/v2client.h>
-#include <iobuf/iobuf.h>
-#include <str/str.h>
+#include <bglibs/iobuf.h>
+#include <bglibs/str.h>
 
 const char program[] = "imapfront-auth";
 const int msg_show_pid = 1;
diff --git a/iobytes.c b/iobytes.c
index 267d3ff..fbbbdf8 100644
--- a/iobytes.c
+++ b/iobytes.c
@@ -15,9 +15,9 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-#include <iobuf/iobuf.h>
-#include <msg/msg.h>
-#include <str/str.h>
+#include <bglibs/iobuf.h>
+#include <bglibs/msg.h>
+#include <bglibs/str.h>
 
 void report_io_bytes(void)
 {
diff --git a/mailfront-internal.h b/mailfront-internal.h
index 42a0ae3..3339c51 100644
--- a/mailfront-internal.h
+++ b/mailfront-internal.h
@@ -2,7 +2,7 @@
 #define MAIL_FRONT__MAILFRONT_INTERNAL__H__
 
 #include "mailfront.h"
-#include <adt/ghash.h>
+#include <bglibs/ghash.h>
 
 struct session
 {
diff --git a/mailfront.c b/mailfront.c
index 3e2acc3..2dda2fa 100644
--- a/mailfront.c
+++ b/mailfront.c
@@ -2,10 +2,10 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <systime.h>
-#include <msg/msg.h>
-#include <path/path.h>
-#include <str/str.h>
+#include <bglibs/systime.h>
+#include <bglibs/msg.h>
+#include <bglibs/path.h>
+#include <bglibs/str.h>
 
 #include "mailfront-internal.h"
 
diff --git a/mailfront.h b/mailfront.h
index 2d85733..77cd744 100644
--- a/mailfront.h
+++ b/mailfront.h
@@ -2,8 +2,8 @@
 #define MAIL_FRONT__MAILFRONT__H__
 
 #include "responses.h"
-#include <iobuf/iobuf.h>
-#include <str/str.h>
+#include <bglibs/iobuf.h>
+#include <bglibs/str.h>
 #include "constants.h"
 
 #define FLAG_NEED_FILE (1<<0)
diff --git a/modules.c b/modules.c
index a39b712..2a0a966 100644
--- a/modules.c
+++ b/modules.c
@@ -1,7 +1,7 @@
 #include <dlfcn.h>
 #include <stdlib.h>
 #include <string.h>
-#include <msg/msg.h>
+#include <bglibs/msg.h>
 #include "mailfront-internal.h"
 #include "conf_modules.c"
 
diff --git a/netstring.c b/netstring.c
index 0666e54..b347282 100644
--- a/netstring.c
+++ b/netstring.c
@@ -1,5 +1,5 @@
-#include <iobuf/iobuf.h>
-#include <str/str.h>
+#include <bglibs/iobuf.h>
+#include <bglibs/str.h>
 #include "mailfront.h"
 
 int get_netstring_len(ibuf* in, unsigned long* i)
diff --git a/plugin-add-received.c b/plugin-add-received.c
index 1da0e4b..3d3b409 100644
--- a/plugin-add-received.c
+++ b/plugin-add-received.c
@@ -1,8 +1,8 @@
-#include <systime.h>
+#include <bglibs/systime.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <msg/msg.h>
+#include <bglibs/msg.h>
 #include "mailfront.h"
 
 static str received;
diff --git a/plugin-clamav.c b/plugin-clamav.c
index a4b41e9..4ee258a 100644
--- a/plugin-clamav.c
+++ b/plugin-clamav.c
@@ -1,14 +1,14 @@
 #include "mailfront.h"
 
-#include <sysdeps.h>
+#include <bglibs/sysdeps.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include <msg/msg.h>
-#include <net/resolve.h>
-#include <net/socket.h>
-#include <uint32.h>
+#include <bglibs/msg.h>
+#include <bglibs/resolve.h>
+#include <bglibs/socket.h>
+#include <bglibs/uint32.h>
 
 static RESPONSE(no_hostname,451,"4.3.0 Could not resolve virus scanner hostname");
 static RESPONSE(no_scan,451,"4.3.0 Could not virus scan message");
diff --git a/plugin-counters.c b/plugin-counters.c
index 19943f6..e475fbe 100644
--- a/plugin-counters.c
+++ b/plugin-counters.c
@@ -1,7 +1,7 @@
 #include "mailfront.h"
 #include <stdlib.h>
 #include <string.h>
-#include <str/iter.h>
+#include <bglibs/striter.h>
 
 static RESPONSE(too_big, 552, "5.2.3 The message would exceed the maximum message size.");
 static RESPONSE(too_long, 552, "5.2.3 Sorry, that message exceeds the maximum message length.");
diff --git a/plugin-lua.c b/plugin-lua.c
index e4e4787..93d775f 100644
--- a/plugin-lua.c
+++ b/plugin-lua.c
@@ -1,7 +1,7 @@
 #include <lua.h>
 #include <lauxlib.h>
 #include <lualib.h>
-#include <msg/msg.h>
+#include <bglibs/msg.h>
 #include "mailfront.h"
 
 static int l_msg(lua_State *L)
diff --git a/plugin-mailrules.c b/plugin-mailrules.c
index 30e9cde..22f7da8 100644
--- a/plugin-mailrules.c
+++ b/plugin-mailrules.c
@@ -4,11 +4,11 @@
 
 #include "mailfront.h"
 
-#include <cdb/cdb.h>
-#include <dict/dict.h>
-#include <dict/load.h>
-#include <iobuf/iobuf.h>
-#include <str/str.h>
+#include <bglibs/cdb.h>
+#include <bglibs/dict.h>
+#include <bglibs/dict.h>
+#include <bglibs/iobuf.h>
+#include <bglibs/str.h>
 
 static RESPONSE(erropen,421,"4.3.0 Could not open $MAILRULES file");
 static RESPONSE(syntax,421,"4.3.0 Syntax error in $MAILRULES");
diff --git a/plugin-patterns.c b/plugin-patterns.c
index a2d1b8d..67a7d7e 100644
--- a/plugin-patterns.c
+++ b/plugin-patterns.c
@@ -1,10 +1,10 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <iobuf/iobuf.h>
-#include <msg/msg.h>
-#include <msg/wrap.h>
-#include <str/str.h>
+#include <bglibs/iobuf.h>
+#include <bglibs/msg.h>
+#include <bglibs/wrap.h>
+#include <bglibs/str.h>
 
 #include "mailfront.h"
 
diff --git a/plugin-qmail-validate.c b/plugin-qmail-validate.c
index 162250b..28b03b4 100644
--- a/plugin-qmail-validate.c
+++ b/plugin-qmail-validate.c
@@ -1,10 +1,10 @@
 #include <unistd.h>
 #include "mailfront.h"
-#include <iobuf/iobuf.h>
-#include <dict/dict.h>
-#include <dict/load.h>
+#include <bglibs/iobuf.h>
+#include <bglibs/dict.h>
+#include <bglibs/dict.h>
 #include "conf_qmail.c"
-#include <cdb/cdb.h>
+#include <bglibs/cdb.h>
 
 static RESPONSE(accept,250,0);
 static RESPONSE(no_chdir,451,"4.3.0 Could not change to the qmail directory.");
diff --git a/plugin-rbl.c b/plugin-rbl.c
index 7009f84..38a488d 100644
--- a/plugin-rbl.c
+++ b/plugin-rbl.c
@@ -1,10 +1,10 @@
 #include <string.h>
 
-#include <msg/msg.h>
-#include <msg/wrap.h>
-#include <net/dns.h>
-#include <net/ipv4.h>
-#include <str/str.h>
+#include <bglibs/msg.h>
+#include <bglibs/wrap.h>
+#include <bglibs/dns.h>
+#include <bglibs/ipv4.h>
+#include <bglibs/str.h>
 
 #include "mailfront.h"
 
diff --git a/plugin-spamassassin.c b/plugin-spamassassin.c
index 71c6851..ee522ef 100644
--- a/plugin-spamassassin.c
+++ b/plugin-spamassassin.c
@@ -1,13 +1,13 @@
 #include "mailfront.h"
 
-#include <sysdeps.h>
+#include <bglibs/sysdeps.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include <msg/msg.h>
-#include <net/resolve.h>
-#include <net/socket.h>
+#include <bglibs/msg.h>
+#include <bglibs/resolve.h>
+#include <bglibs/socket.h>
 
 static RESPONSE(no_hostname,451,"4.3.0 Could not resolve SpamAssassin hostname");
 static RESPONSE(no_scan,451,"4.3.0 Could not SpamAssassin scan message");
diff --git a/plugin-starttls-ucspi.c b/plugin-starttls-ucspi.c
index b216926..ff1a755 100644
--- a/plugin-starttls-ucspi.c
+++ b/plugin-starttls-ucspi.c
@@ -1,7 +1,7 @@
 #include "mailfront.h"
 #include <stdlib.h>
 #include <unistd.h>
-#include <iobuf/iobuf.h>
+#include <bglibs/iobuf.h>
 
 static RESPONSE(start, 220, "2.0.0 Ready to start TLS");
 static RESPONSE(earlytalker, 500, "5.5.1 Unexpected pipelined commands following STARTTLS");
diff --git a/pop3-capa.c b/pop3-capa.c
index 51a090c..c233b71 100644
--- a/pop3-capa.c
+++ b/pop3-capa.c
@@ -23,8 +23,8 @@
  * ossi@FutureQuest.net
  */
 #include <string.h>
-#include <iobuf/obuf.h>
-#include <str/str.h>
+#include <bglibs/obuf.h>
+#include <bglibs/str.h>
 #include <cvm/sasl.h>
 #include "pop3.h"
 
diff --git a/pop3-mainloop.c b/pop3-mainloop.c
index 0b9d20b..681cb00 100644
--- a/pop3-mainloop.c
+++ b/pop3-mainloop.c
@@ -24,8 +24,8 @@
  */
 #include <stdlib.h>
 #include <string.h>
-#include <iobuf/iobuf.h>
-#include <str/str.h>
+#include <bglibs/iobuf.h>
+#include <bglibs/str.h>
 #include "pop3.h"
 
 const int msg_show_pid = 1;
diff --git a/pop3-response.c b/pop3-response.c
index e0ccaa4..61195f0 100644
--- a/pop3-response.c
+++ b/pop3-response.c
@@ -26,8 +26,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <iobuf/iobuf.h>
-#include <msg/msg.h>
+#include <bglibs/iobuf.h>
+#include <bglibs/msg.h>
 #include "pop3.h"
 
 const char err_internal[] = "-ERR Internal error";
diff --git a/pop3front-auth.c b/pop3front-auth.c
index 0548242..6ca443d 100644
--- a/pop3front-auth.c
+++ b/pop3front-auth.c
@@ -26,9 +26,9 @@
 #include <string.h>
 #include <unistd.h>
 #include <cvm/v2client.h>
-#include <iobuf/iobuf.h>
-#include <str/iter.h>
-#include <str/str.h>
+#include <bglibs/iobuf.h>
+#include <bglibs/striter.h>
+#include <bglibs/str.h>
 #include <cvm/sasl.h>
 #include "pop3.h"
 
diff --git a/pop3front-maildir.c b/pop3front-maildir.c
index 84680a2..d7ff9a9 100644
--- a/pop3front-maildir.c
+++ b/pop3front-maildir.c
@@ -29,10 +29,10 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#include <sysdeps.h>
-#include <iobuf/iobuf.h>
-#include <msg/msg.h>
-#include <str/str.h>
+#include <bglibs/sysdeps.h>
+#include <bglibs/iobuf.h>
+#include <bglibs/msg.h>
+#include <bglibs/str.h>
 #include "pop3.h"
 
 typedef struct
diff --git a/protocol-qmqp.c b/protocol-qmqp.c
index b019457..3de1496 100644
--- a/protocol-qmqp.c
+++ b/protocol-qmqp.c
@@ -2,10 +2,10 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <systime.h>
-#include <iobuf/iobuf.h>
-#include <msg/msg.h>
-#include <str/str.h>
+#include <bglibs/systime.h>
+#include <bglibs/iobuf.h>
+#include <bglibs/msg.h>
+#include <bglibs/str.h>
 
 #include "mailfront.h"
 #include "qmtp.h"
diff --git a/protocol-qmtp.c b/protocol-qmtp.c
index 4a0ab1f..0491448 100644
--- a/protocol-qmtp.c
+++ b/protocol-qmtp.c
@@ -2,10 +2,10 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <systime.h>
-#include <iobuf/iobuf.h>
-#include <msg/msg.h>
-#include <str/str.h>
+#include <bglibs/systime.h>
+#include <bglibs/iobuf.h>
+#include <bglibs/msg.h>
+#include <bglibs/str.h>
 
 #include "mailfront.h"
 #include "qmtp.h"
diff --git a/protocol-smtp.c b/protocol-smtp.c
index df39394..96e2df6 100644
--- a/protocol-smtp.c
+++ b/protocol-smtp.c
@@ -1,11 +1,11 @@
 #include <stdlib.h>
 #include <string.h>
-#include <systime.h>
+#include <bglibs/systime.h>
 
 #include "mailfront.h"
 
-#include <iobuf/iobuf.h>
-#include <msg/msg.h>
+#include <bglibs/iobuf.h>
+#include <bglibs/msg.h>
 
 extern struct protocol protocol;
 
diff --git a/qmtp-respond.c b/qmtp-respond.c
index c03eb7c..dd6337d 100644
--- a/qmtp-respond.c
+++ b/qmtp-respond.c
@@ -1,8 +1,8 @@
 #include <string.h>
 #include "responses.h"
 #include "qmtp.h"
-#include <iobuf/iobuf.h>
-#include <str/str.h>
+#include <bglibs/iobuf.h>
+#include <bglibs/str.h>
 
 int qmtp_respond_line(unsigned num, int final,
 		      const char* msg, unsigned long len)
diff --git a/session.c b/session.c
index 8bb537b..8d04e8a 100644
--- a/session.c
+++ b/session.c
@@ -1,7 +1,7 @@
 #include <string.h>
 #include <stdlib.h>
-#include <msg/msg.h>
-#include <str/env.h>
+#include <bglibs/msg.h>
+#include <bglibs/envstr.h>
 #include "mailfront-internal.h"
 
 struct session session = {
diff --git a/testcvm.c b/testcvm.c
index a06969d..2995935 100644
--- a/testcvm.c
+++ b/testcvm.c
@@ -1,4 +1,4 @@
-#include <sysdeps.h>
+#include <bglibs/sysdeps.h>
 #include <unistd.h>
 
 #include <cvm/module.h>
diff --git a/timeout.c b/timeout.c
index 4c5a936..e09d36d 100644
--- a/timeout.c
+++ b/timeout.c
@@ -23,10 +23,10 @@
  * ossi@FutureQuest.net
  */
 #include <stdlib.h>
-#include <sysdeps.h>
+#include <bglibs/sysdeps.h>
 #include <unistd.h>
-#include <iobuf/iobuf.h>
-#include <unix/sig.h>
+#include <bglibs/iobuf.h>
+#include <bglibs/sig.h>
 
 unsigned long timeout;
 unsigned long session_timeout;