diff --git a/config/busybox.config b/config/busybox.config
index ffe3c318..dfab8af7 100644
--- a/config/busybox.config
+++ b/config/busybox.config
@@ -331,8 +331,8 @@ CONFIG_UNIQ=y
 # CONFIG_UNLINK is not set
 CONFIG_USLEEP=y
 # CONFIG_UUDECODE is not set
-CONFIG_BASE32=n
-CONFIG_BASE64=y
+CONFIG_BASE32=y
+CONFIG_BASE64=n
 # CONFIG_UUENCODE is not set
 CONFIG_WC=y
 CONFIG_FEATURE_WC_LARGE=y
diff --git a/modules/tpmtotp b/modules/tpmtotp
index 433df8ce..e4389aae 100644
--- a/modules/tpmtotp
+++ b/modules/tpmtotp
@@ -19,7 +19,6 @@ tpmtotp_target := \
 tpmtotp_output := \
 	totp \
 	hotp \
-	base32 \
 	qrenc \
 	util/tpm \