diff --git a/ChangeLog b/ChangeLog
index e8fbd75c..697d71ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
 VERSION 0.6.4cvs
 ================
 
+2005-02-01  Vincent Richard  <vincent@vincent-richard.net>
+
+ * text.cpp: fixed possible segfault when encoding is Base64 (typo).
+
 2005-01-28  Vincent Richard  <vincent@vincent-richard.net>
 
  * Started version 0.6.4.
diff --git a/src/text.cpp b/src/text.cpp
index 5995daf1..e0a6e1de 100644
--- a/src/text.cpp
+++ b/src/text.cpp
@@ -537,7 +537,7 @@ void text::encodeAndFold(utility::outputStream& os, const string::size_type maxL
 
 			encoder* theEncoder;
 
-			if (encoding == 'B') theEncoder == new encoderB64;
+			if (encoding == 'B') theEncoder = new encoderB64;
 			else theEncoder = new encoderQP;
 
 			string qpEncodedBuffer;