diff --git a/src/roken/Makefile.in b/src/roken/Makefile.in
index b7db251535..7c22a31ede 100644
--- a/src/roken/Makefile.in
+++ b/src/roken/Makefile.in
@@ -10,7 +10,8 @@ include @TOP_OBJDIR@/src/config/Makefile.shared
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 
-HEADERS = ${TOP_INCDIR}/roken.h \
+HEADERS = ${TOP_INCDIR}/base64.h \
+	  ${TOP_INCDIR}/roken.h \
 	  ${TOP_INCDIR}/roken-common.h
 
 UPSTREAM = $(TOP_SRCDIR)/external/heimdal/roken
@@ -35,6 +36,7 @@ clean:
 	$(RM) -f $(OBJECTS) $(SHLIBOBJ) librokenafs.a librokenafs.exp
 
 OBJECTS = $(ROKEN_LIBOBJS) \
+	  base64.o \
 	  cloexec.o ct.o hex.o issuid.o net_read.o net_write.o socket.o \
 	  snprintf.o warnerr.o
 
@@ -55,6 +57,9 @@ librokenafs.a: $(OBJECTS)
 	$(AR) crv $@ $(OBJECTS)
 	$(RANLIB) $@
 
+$(TOP_INCDIR)/base64.h: ${UPSTREAM}/base64.h
+	$(INSTALL_DATA) $? $@
+
 $(TOP_INCDIR)/err.h: ${UPSTREAM}/err.hin
 	cp $? $@
 
@@ -67,6 +72,9 @@ $(TOP_INCDIR)/roken-common.h: $(UPSTREAM)/roken-common.h
 err.h: ${UPSTREAM}/err.hin
 	cp $? $@
 
+base64.o: $(UPSTREAM)/base64.c
+	$(AFS_CCRULE) $(UPSTREAM)/base64.c
+
 cloexec.o: ${UPSTREAM}/cloexec.c
 	$(AFS_CCRULE) $(UPSTREAM)/cloexec.c
 
diff --git a/src/roken/NTMakefile b/src/roken/NTMakefile
index adea2dcbca..5886b795f4 100644
--- a/src/roken/NTMakefile
+++ b/src/roken/NTMakefile
@@ -18,11 +18,13 @@ INCFILES = \
 	$(INCFILEDIR)\roken.h
 
 ROKEN_INCFILES = \
-	$(INCFILEDIR)\roken-common.h
+	$(INCFILEDIR)\roken-common.h \
+	$(INCFILEDIR)\base64.h
 
 LIBFILE = $(DESTDIR)\lib\afsroken.dll
 
 ROKEN_OBJS = \
+	$(OUT)\base64.obj \
         $(OUT)\cloexec.obj \
         $(OUT)\ct.obj \
 	$(OUT)\ecalloc.obj \
diff --git a/src/roken/afsroken.def b/src/roken/afsroken.def
index 689556caee..4b000ea1bd 100644
--- a/src/roken/afsroken.def
+++ b/src/roken/afsroken.def
@@ -24,3 +24,5 @@ EXPORTS
 	vwarnx			@28
 	warn			@29
 	warnx			@30
+	base64_decode		@31
+	base64_encode		@32
diff --git a/src/roken/librokenafs.map b/src/roken/librokenafs.map
index 11bca46cb3..340529ec58 100644
--- a/src/roken/librokenafs.map
+++ b/src/roken/librokenafs.map
@@ -1,5 +1,7 @@
 {
     global:
+		base64_decode;
+		base64_encode;
 		ct_memcmp;
 		daemon;
 		err;