diff --git a/CMakeLists.txt b/CMakeLists.txt
index ef479095f..c7f04c6f9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -65,6 +65,15 @@ option(BOOST_IGNORE_SYSTEM_PATHS "Ignore boost system paths for local boost inst
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 enable_testing()
 
+# Check whether we're on a 32-bit or 64-bit system
+if(CMAKE_SIZEOF_VOID_P EQUAL "8")
+  message(STATUS "Building on a 64-bit system")
+  set(ARCH_WIDTH "64")
+else()
+  message(STATUS "Building on a 32-bit system")
+  set(ARCH_WIDTH "32")
+endif()
+
 # Check if we're on FreeBSD so we can exclude the local miniupnpc (it should be installed from ports instead)
 # CMAKE_SYSTEM_NAME checks are commonly known, but specifically taken from libsdl's CMakeLists
 if(CMAKE_SYSTEM_NAME MATCHES "kFreeBSD.*")
diff --git a/db_drivers/CMakeLists.txt b/db_drivers/CMakeLists.txt
index db386c11f..c96f623d1 100644
--- a/db_drivers/CMakeLists.txt
+++ b/db_drivers/CMakeLists.txt
@@ -28,14 +28,8 @@
 
 # We aren't even going to check the system for an installed LMDB driver, as it is too
 # critical a consensus component to rely on dynamically linked libraries
-if(CMAKE_SIZEOF_VOID_P EQUAL "8")
-  message(STATUS "Using 64-bit LMDB from source tree")
-  add_subdirectory(liblmdb)
-  set(LMDB_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/liblmdb" PARENT_SCOPE)
-else()
-  message(STATUS "Using 32-bit LMDB from source tree")
-  add_subdirectory(liblmdb-vl32)
-  set(LMDB_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/liblmdb-vl32" PARENT_SCOPE)
-endif()
+message(STATUS "Using ${ARCH_WIDTH}-bit LMDB from source tree")
+add_subdirectory(liblmdb${ARCH_WIDTH})
+set(LMDB_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/liblmdb${ARCH_WIDTH}" PARENT_SCOPE)
 
 set(LMDB_LIBRARY "lmdb" PARENT_SCOPE)
diff --git a/db_drivers/liblmdb-vl32/.gitignore b/db_drivers/liblmdb32/.gitignore
similarity index 100%
rename from db_drivers/liblmdb-vl32/.gitignore
rename to db_drivers/liblmdb32/.gitignore
diff --git a/db_drivers/liblmdb-vl32/CHANGES b/db_drivers/liblmdb32/CHANGES
similarity index 100%
rename from db_drivers/liblmdb-vl32/CHANGES
rename to db_drivers/liblmdb32/CHANGES
diff --git a/db_drivers/liblmdb-vl32/CMakeLists.txt b/db_drivers/liblmdb32/CMakeLists.txt
similarity index 100%
rename from db_drivers/liblmdb-vl32/CMakeLists.txt
rename to db_drivers/liblmdb32/CMakeLists.txt
diff --git a/db_drivers/liblmdb-vl32/COPYRIGHT b/db_drivers/liblmdb32/COPYRIGHT
similarity index 100%
rename from db_drivers/liblmdb-vl32/COPYRIGHT
rename to db_drivers/liblmdb32/COPYRIGHT
diff --git a/db_drivers/liblmdb-vl32/Doxyfile b/db_drivers/liblmdb32/Doxyfile
similarity index 100%
rename from db_drivers/liblmdb-vl32/Doxyfile
rename to db_drivers/liblmdb32/Doxyfile
diff --git a/db_drivers/liblmdb-vl32/LICENSE b/db_drivers/liblmdb32/LICENSE
similarity index 100%
rename from db_drivers/liblmdb-vl32/LICENSE
rename to db_drivers/liblmdb32/LICENSE
diff --git a/db_drivers/liblmdb-vl32/Makefile b/db_drivers/liblmdb32/Makefile
similarity index 100%
rename from db_drivers/liblmdb-vl32/Makefile
rename to db_drivers/liblmdb32/Makefile
diff --git a/db_drivers/liblmdb-vl32/lmdb.h b/db_drivers/liblmdb32/lmdb.h
similarity index 100%
rename from db_drivers/liblmdb-vl32/lmdb.h
rename to db_drivers/liblmdb32/lmdb.h
diff --git a/db_drivers/liblmdb-vl32/mdb.c b/db_drivers/liblmdb32/mdb.c
similarity index 100%
rename from db_drivers/liblmdb-vl32/mdb.c
rename to db_drivers/liblmdb32/mdb.c
diff --git a/db_drivers/liblmdb-vl32/mdb_copy.1 b/db_drivers/liblmdb32/mdb_copy.1
similarity index 100%
rename from db_drivers/liblmdb-vl32/mdb_copy.1
rename to db_drivers/liblmdb32/mdb_copy.1
diff --git a/db_drivers/liblmdb-vl32/mdb_copy.c b/db_drivers/liblmdb32/mdb_copy.c
similarity index 100%
rename from db_drivers/liblmdb-vl32/mdb_copy.c
rename to db_drivers/liblmdb32/mdb_copy.c
diff --git a/db_drivers/liblmdb-vl32/mdb_dump.1 b/db_drivers/liblmdb32/mdb_dump.1
similarity index 100%
rename from db_drivers/liblmdb-vl32/mdb_dump.1
rename to db_drivers/liblmdb32/mdb_dump.1
diff --git a/db_drivers/liblmdb-vl32/mdb_dump.c b/db_drivers/liblmdb32/mdb_dump.c
similarity index 100%
rename from db_drivers/liblmdb-vl32/mdb_dump.c
rename to db_drivers/liblmdb32/mdb_dump.c
diff --git a/db_drivers/liblmdb-vl32/mdb_load.1 b/db_drivers/liblmdb32/mdb_load.1
similarity index 100%
rename from db_drivers/liblmdb-vl32/mdb_load.1
rename to db_drivers/liblmdb32/mdb_load.1
diff --git a/db_drivers/liblmdb-vl32/mdb_load.c b/db_drivers/liblmdb32/mdb_load.c
similarity index 100%
rename from db_drivers/liblmdb-vl32/mdb_load.c
rename to db_drivers/liblmdb32/mdb_load.c
diff --git a/db_drivers/liblmdb-vl32/mdb_stat.1 b/db_drivers/liblmdb32/mdb_stat.1
similarity index 100%
rename from db_drivers/liblmdb-vl32/mdb_stat.1
rename to db_drivers/liblmdb32/mdb_stat.1
diff --git a/db_drivers/liblmdb-vl32/mdb_stat.c b/db_drivers/liblmdb32/mdb_stat.c
similarity index 100%
rename from db_drivers/liblmdb-vl32/mdb_stat.c
rename to db_drivers/liblmdb32/mdb_stat.c
diff --git a/db_drivers/liblmdb-vl32/midl.c b/db_drivers/liblmdb32/midl.c
similarity index 100%
rename from db_drivers/liblmdb-vl32/midl.c
rename to db_drivers/liblmdb32/midl.c
diff --git a/db_drivers/liblmdb-vl32/midl.h b/db_drivers/liblmdb32/midl.h
similarity index 100%
rename from db_drivers/liblmdb-vl32/midl.h
rename to db_drivers/liblmdb32/midl.h
diff --git a/db_drivers/liblmdb-vl32/mtest.c b/db_drivers/liblmdb32/mtest.c
similarity index 100%
rename from db_drivers/liblmdb-vl32/mtest.c
rename to db_drivers/liblmdb32/mtest.c
diff --git a/db_drivers/liblmdb-vl32/mtest2.c b/db_drivers/liblmdb32/mtest2.c
similarity index 100%
rename from db_drivers/liblmdb-vl32/mtest2.c
rename to db_drivers/liblmdb32/mtest2.c
diff --git a/db_drivers/liblmdb-vl32/mtest3.c b/db_drivers/liblmdb32/mtest3.c
similarity index 100%
rename from db_drivers/liblmdb-vl32/mtest3.c
rename to db_drivers/liblmdb32/mtest3.c
diff --git a/db_drivers/liblmdb-vl32/mtest4.c b/db_drivers/liblmdb32/mtest4.c
similarity index 100%
rename from db_drivers/liblmdb-vl32/mtest4.c
rename to db_drivers/liblmdb32/mtest4.c
diff --git a/db_drivers/liblmdb-vl32/mtest5.c b/db_drivers/liblmdb32/mtest5.c
similarity index 100%
rename from db_drivers/liblmdb-vl32/mtest5.c
rename to db_drivers/liblmdb32/mtest5.c
diff --git a/db_drivers/liblmdb-vl32/mtest6.c b/db_drivers/liblmdb32/mtest6.c
similarity index 100%
rename from db_drivers/liblmdb-vl32/mtest6.c
rename to db_drivers/liblmdb32/mtest6.c
diff --git a/db_drivers/liblmdb-vl32/sample-bdb.txt b/db_drivers/liblmdb32/sample-bdb.txt
similarity index 100%
rename from db_drivers/liblmdb-vl32/sample-bdb.txt
rename to db_drivers/liblmdb32/sample-bdb.txt
diff --git a/db_drivers/liblmdb-vl32/sample-mdb.txt b/db_drivers/liblmdb32/sample-mdb.txt
similarity index 100%
rename from db_drivers/liblmdb-vl32/sample-mdb.txt
rename to db_drivers/liblmdb32/sample-mdb.txt
diff --git a/db_drivers/liblmdb-vl32/tooltag b/db_drivers/liblmdb32/tooltag
similarity index 100%
rename from db_drivers/liblmdb-vl32/tooltag
rename to db_drivers/liblmdb32/tooltag
diff --git a/db_drivers/liblmdb/.gitignore b/db_drivers/liblmdb64/.gitignore
similarity index 100%
rename from db_drivers/liblmdb/.gitignore
rename to db_drivers/liblmdb64/.gitignore
diff --git a/db_drivers/liblmdb/CHANGES b/db_drivers/liblmdb64/CHANGES
similarity index 100%
rename from db_drivers/liblmdb/CHANGES
rename to db_drivers/liblmdb64/CHANGES
diff --git a/db_drivers/liblmdb/CMakeLists.txt b/db_drivers/liblmdb64/CMakeLists.txt
similarity index 100%
rename from db_drivers/liblmdb/CMakeLists.txt
rename to db_drivers/liblmdb64/CMakeLists.txt
diff --git a/db_drivers/liblmdb/COPYRIGHT b/db_drivers/liblmdb64/COPYRIGHT
similarity index 100%
rename from db_drivers/liblmdb/COPYRIGHT
rename to db_drivers/liblmdb64/COPYRIGHT
diff --git a/db_drivers/liblmdb/Doxyfile b/db_drivers/liblmdb64/Doxyfile
similarity index 100%
rename from db_drivers/liblmdb/Doxyfile
rename to db_drivers/liblmdb64/Doxyfile
diff --git a/db_drivers/liblmdb/LICENSE b/db_drivers/liblmdb64/LICENSE
similarity index 100%
rename from db_drivers/liblmdb/LICENSE
rename to db_drivers/liblmdb64/LICENSE
diff --git a/db_drivers/liblmdb/Makefile b/db_drivers/liblmdb64/Makefile
similarity index 100%
rename from db_drivers/liblmdb/Makefile
rename to db_drivers/liblmdb64/Makefile
diff --git a/db_drivers/liblmdb/lmdb.h b/db_drivers/liblmdb64/lmdb.h
similarity index 100%
rename from db_drivers/liblmdb/lmdb.h
rename to db_drivers/liblmdb64/lmdb.h
diff --git a/db_drivers/liblmdb/mdb.c b/db_drivers/liblmdb64/mdb.c
similarity index 100%
rename from db_drivers/liblmdb/mdb.c
rename to db_drivers/liblmdb64/mdb.c
diff --git a/db_drivers/liblmdb/mdb_copy.1 b/db_drivers/liblmdb64/mdb_copy.1
similarity index 100%
rename from db_drivers/liblmdb/mdb_copy.1
rename to db_drivers/liblmdb64/mdb_copy.1
diff --git a/db_drivers/liblmdb/mdb_copy.c b/db_drivers/liblmdb64/mdb_copy.c
similarity index 100%
rename from db_drivers/liblmdb/mdb_copy.c
rename to db_drivers/liblmdb64/mdb_copy.c
diff --git a/db_drivers/liblmdb/mdb_dump.1 b/db_drivers/liblmdb64/mdb_dump.1
similarity index 100%
rename from db_drivers/liblmdb/mdb_dump.1
rename to db_drivers/liblmdb64/mdb_dump.1
diff --git a/db_drivers/liblmdb/mdb_dump.c b/db_drivers/liblmdb64/mdb_dump.c
similarity index 100%
rename from db_drivers/liblmdb/mdb_dump.c
rename to db_drivers/liblmdb64/mdb_dump.c
diff --git a/db_drivers/liblmdb/mdb_load.1 b/db_drivers/liblmdb64/mdb_load.1
similarity index 100%
rename from db_drivers/liblmdb/mdb_load.1
rename to db_drivers/liblmdb64/mdb_load.1
diff --git a/db_drivers/liblmdb/mdb_load.c b/db_drivers/liblmdb64/mdb_load.c
similarity index 100%
rename from db_drivers/liblmdb/mdb_load.c
rename to db_drivers/liblmdb64/mdb_load.c
diff --git a/db_drivers/liblmdb/mdb_stat.1 b/db_drivers/liblmdb64/mdb_stat.1
similarity index 100%
rename from db_drivers/liblmdb/mdb_stat.1
rename to db_drivers/liblmdb64/mdb_stat.1
diff --git a/db_drivers/liblmdb/mdb_stat.c b/db_drivers/liblmdb64/mdb_stat.c
similarity index 100%
rename from db_drivers/liblmdb/mdb_stat.c
rename to db_drivers/liblmdb64/mdb_stat.c
diff --git a/db_drivers/liblmdb/midl.c b/db_drivers/liblmdb64/midl.c
similarity index 100%
rename from db_drivers/liblmdb/midl.c
rename to db_drivers/liblmdb64/midl.c
diff --git a/db_drivers/liblmdb/midl.h b/db_drivers/liblmdb64/midl.h
similarity index 100%
rename from db_drivers/liblmdb/midl.h
rename to db_drivers/liblmdb64/midl.h
diff --git a/db_drivers/liblmdb/mtest.c b/db_drivers/liblmdb64/mtest.c
similarity index 100%
rename from db_drivers/liblmdb/mtest.c
rename to db_drivers/liblmdb64/mtest.c
diff --git a/db_drivers/liblmdb/mtest2.c b/db_drivers/liblmdb64/mtest2.c
similarity index 100%
rename from db_drivers/liblmdb/mtest2.c
rename to db_drivers/liblmdb64/mtest2.c
diff --git a/db_drivers/liblmdb/mtest3.c b/db_drivers/liblmdb64/mtest3.c
similarity index 100%
rename from db_drivers/liblmdb/mtest3.c
rename to db_drivers/liblmdb64/mtest3.c
diff --git a/db_drivers/liblmdb/mtest4.c b/db_drivers/liblmdb64/mtest4.c
similarity index 100%
rename from db_drivers/liblmdb/mtest4.c
rename to db_drivers/liblmdb64/mtest4.c
diff --git a/db_drivers/liblmdb/mtest5.c b/db_drivers/liblmdb64/mtest5.c
similarity index 100%
rename from db_drivers/liblmdb/mtest5.c
rename to db_drivers/liblmdb64/mtest5.c
diff --git a/db_drivers/liblmdb/mtest6.c b/db_drivers/liblmdb64/mtest6.c
similarity index 100%
rename from db_drivers/liblmdb/mtest6.c
rename to db_drivers/liblmdb64/mtest6.c
diff --git a/db_drivers/liblmdb/sample-bdb.txt b/db_drivers/liblmdb64/sample-bdb.txt
similarity index 100%
rename from db_drivers/liblmdb/sample-bdb.txt
rename to db_drivers/liblmdb64/sample-bdb.txt
diff --git a/db_drivers/liblmdb/sample-mdb.txt b/db_drivers/liblmdb64/sample-mdb.txt
similarity index 100%
rename from db_drivers/liblmdb/sample-mdb.txt
rename to db_drivers/liblmdb64/sample-mdb.txt
diff --git a/db_drivers/liblmdb/tooltag b/db_drivers/liblmdb64/tooltag
similarity index 100%
rename from db_drivers/liblmdb/tooltag
rename to db_drivers/liblmdb64/tooltag