diff --git a/deps/.gitignore b/deps/.gitignore
index fed54ef8..0e3d7944 100644
--- a/deps/.gitignore
+++ b/deps/.gitignore
@@ -1,6 +1,7 @@
 */upstream
 */META
 !ulex/META
+!base64/META
 */*.ml
 */*.mli
 */*.tar.gz
diff --git a/deps/base64/META b/deps/base64/META
new file mode 100644
index 00000000..5c1c71ce
--- /dev/null
+++ b/deps/base64/META
@@ -0,0 +1,17 @@
+version = "3.2.0"
+description = ""
+requires = "bytes"
+archive(byte) = "base64.cma"
+archive(native) = "base64.cmxa"
+plugin(byte) = "base64.cma"
+plugin(native) = "base64.cmxs"
+package "rfc2045" (
+  directory = "rfc2045"
+  version = "3.2.0"
+  description = ""
+  requires = "bytes"
+  archive(byte) = "base64_rfc2045.cma"
+  archive(native) = "base64_rfc2045.cmxa"
+  plugin(byte) = "base64_rfc2045.cma"
+  plugin(native) = "base64_rfc2045.cmxs"
+)
diff --git a/deps/base64/Makefile b/deps/base64/Makefile
index 94d4bc04..404929be 100644
--- a/deps/base64/Makefile
+++ b/deps/base64/Makefile
@@ -3,9 +3,9 @@ OCAMLMAKEFILE := ../../make/OCamlMakefile
 
 RESULT = base64
 
-SOURCES = b64.ml
+SOURCES = base64.ml base64_rfc2045.ml
 
-LIBINSTALL_FILES = b64.mli b64.cmi b64.cmx base64.cma base64.cmxa base64.a
+LIBINSTALL_FILES = base64.mli base64.cmi base64_rfc2045.mli base64_rfc2045.cmi base64.cma base64.cmxa base64.a
 
 
 all: bcl ncl
diff --git a/deps/base64/Makefile.download b/deps/base64/Makefile.download
index ba8b4def..0d962118 100644
--- a/deps/base64/Makefile.download
+++ b/deps/base64/Makefile.download
@@ -1,11 +1,11 @@
-TARBALL := v2.0.0.tar.gz
+TARBALL := v3.2.0.tar.gz
 URL := https://github.com/mirage/ocaml-base64/archive/$(TARBALL)
-MD5 := 52b9736839c83cf88a9fb1373cf2e35c
+MD5 := de7c122c5fbbcd7ec31a3163a27d04c3
 
 
 UPSTREAM_FILES := \
-	b64.ml b64.mli \
-	META
+	base64.ml base64.mli \
+	base64_rfc2045.ml base64_rfc2045.mli \
 
 
 UPSTREAM_DIR := upstream
@@ -14,7 +14,7 @@ UPSTREAM_DIR := upstream
 all: $(TARBALL) $(UPSTREAM_DIR) $(UPSTREAM_FILES)
 
 
-$(UPSTREAM_FILES): %: $(UPSTREAM_DIR)/lib/%
+$(UPSTREAM_FILES): %: $(UPSTREAM_DIR)/src/%
 	cp $< $@