diff --git a/lib/rex/text.rb b/lib/rex/text.rb
index 49662f30fc..5659a3901b 100644
--- a/lib/rex/text.rb
+++ b/lib/rex/text.rb
@@ -414,7 +414,7 @@ module Text
 	# Base64 encoder
 	#
 	def self.encode_base64(str)
-		[str].pack("m").strip
+		[str].pack("m").gsub(/\s+/, '')
 	end
 
 	#