diff --git a/pkcspad.cpp b/pkcspad.cpp
index 7cee9b95..0ce0aa55 100644
--- a/pkcspad.cpp
+++ b/pkcspad.cpp
@@ -11,11 +11,11 @@
 NAMESPACE_BEGIN(CryptoPP)
 
 // more in dll.cpp
-template<> const byte PKCS_DigestDecoration<MD2>::decoration[] = {0x30,0x20,0x30,0x0c,0x06,0x08,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x02,0x02,0x05,0x00,0x04,0x10};
-template<> const unsigned int PKCS_DigestDecoration<MD2>::length = sizeof(PKCS_DigestDecoration<MD2>::decoration);
+template<> const byte PKCS_DigestDecoration<Weak::MD2>::decoration[] = {0x30,0x20,0x30,0x0c,0x06,0x08,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x02,0x02,0x05,0x00,0x04,0x10};
+template<> const unsigned int PKCS_DigestDecoration<Weak::MD2>::length = sizeof(PKCS_DigestDecoration<Weak::MD2>::decoration);
 
-template<> const byte PKCS_DigestDecoration<MD5>::decoration[] = {0x30,0x20,0x30,0x0c,0x06,0x08,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x02,0x05,0x05,0x00,0x04,0x10};
-template<> const unsigned int PKCS_DigestDecoration<MD5>::length = sizeof(PKCS_DigestDecoration<MD5>::decoration);
+template<> const byte PKCS_DigestDecoration<Weak::MD5>::decoration[] = {0x30,0x20,0x30,0x0c,0x06,0x08,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x02,0x05,0x05,0x00,0x04,0x10};
+template<> const unsigned int PKCS_DigestDecoration<Weak::MD5>::length = sizeof(PKCS_DigestDecoration<Weak::MD5>::decoration);
 
 template<> const byte PKCS_DigestDecoration<RIPEMD160>::decoration[] = {0x30,0x21,0x30,0x09,0x06,0x05,0x2b,0x24,0x03,0x02,0x01,0x05,0x00,0x04,0x14};
 template<> const unsigned int PKCS_DigestDecoration<RIPEMD160>::length = sizeof(PKCS_DigestDecoration<RIPEMD160>::decoration);
diff --git a/pkcspad.h b/pkcspad.h
index 91eac889..4d890890 100644
--- a/pkcspad.h
+++ b/pkcspad.h
@@ -31,14 +31,16 @@ public:
 // PKCS_DigestDecoration can be instantiated with the following
 // classes as specified in PKCS#1 v2.0 and P1363a
 class SHA1;
-class MD2;
-class MD5;
 class RIPEMD160;
 class Tiger;
 class SHA224;
 class SHA256;
 class SHA384;
 class SHA512;
+namespace Weak {
+class MD2;
+class MD5;
+}
 // end of list
 
 #ifdef CRYPTOPP_IS_DLL
diff --git a/regtest.cpp b/regtest.cpp
index a59e0d41..a029b01d 100644
--- a/regtest.cpp
+++ b/regtest.cpp
@@ -1,10 +1,10 @@
 #include "factory.h"
 
+#define CRYPTOPP_ENABLE_NAMESPACE_WEAK
 #include "modes.h"
 #include "dh.h"
 #include "esign.h"
 #include "md2.h"
-#include "trunhash.h"
 #include "rw.h"
 #include "md5.h"
 #include "rsa.h"
@@ -20,6 +20,10 @@
 #include "pssr.h"
 #include "aes.h"
 #include "salsa.h"
+#include "vmac.h"
+#include "tiger.h"
+#include "md5.h"
+#include "sosemanuk.h"
 
 USING_NAMESPACE(CryptoPP)
 
@@ -30,6 +34,7 @@ void RegisterFactories()
 		return;
 
 	RegisterDefaultFactoryFor<SimpleKeyAgreementDomain, DH>();
+	RegisterDefaultFactoryFor<HashTransformation, Weak::MD5>();
 	RegisterDefaultFactoryFor<HashTransformation, SHA1>();
 	RegisterDefaultFactoryFor<HashTransformation, SHA224>();
 	RegisterDefaultFactoryFor<HashTransformation, SHA256>();
@@ -37,30 +42,35 @@ void RegisterFactories()
 	RegisterDefaultFactoryFor<HashTransformation, SHA384>();
 	RegisterDefaultFactoryFor<HashTransformation, SHA512>();
 	RegisterDefaultFactoryFor<HashTransformation, Whirlpool>();
+	RegisterDefaultFactoryFor<HashTransformation, Tiger>();
 #endif
-	RegisterDefaultFactoryFor<HashTransformation, PanamaHash<LittleEndian> >();
-	RegisterDefaultFactoryFor<HashTransformation, PanamaHash<BigEndian> >();
-	RegisterDefaultFactoryFor<MessageAuthenticationCode, HMAC<MD5> >();
+	RegisterDefaultFactoryFor<HashTransformation, RIPEMD160>();
+	RegisterDefaultFactoryFor<HashTransformation, RIPEMD320>();
+	RegisterDefaultFactoryFor<HashTransformation, RIPEMD128>();
+	RegisterDefaultFactoryFor<HashTransformation, RIPEMD256>();
+	RegisterDefaultFactoryFor<HashTransformation, Weak::PanamaHash<LittleEndian> >();
+	RegisterDefaultFactoryFor<HashTransformation, Weak::PanamaHash<BigEndian> >();
+	RegisterDefaultFactoryFor<MessageAuthenticationCode, HMAC<Weak::MD5> >();
 	RegisterDefaultFactoryFor<MessageAuthenticationCode, HMAC<SHA1> >();
 	RegisterDefaultFactoryFor<MessageAuthenticationCode, HMAC<RIPEMD160> >();
 	RegisterDefaultFactoryFor<MessageAuthenticationCode, TTMAC>();
-	RegisterDefaultFactoryFor<MessageAuthenticationCode, PanamaMAC<LittleEndian> >();
-	RegisterDefaultFactoryFor<MessageAuthenticationCode, PanamaMAC<BigEndian> >();
+	RegisterDefaultFactoryFor<MessageAuthenticationCode, VMAC<AES> >();
+	RegisterDefaultFactoryFor<MessageAuthenticationCode, VMAC<AES, 64> >();
+	RegisterDefaultFactoryFor<MessageAuthenticationCode, Weak::PanamaMAC<LittleEndian> >();
+	RegisterDefaultFactoryFor<MessageAuthenticationCode, Weak::PanamaMAC<BigEndian> >();
 	RegisterAsymmetricCipherDefaultFactories<RSAES<OAEP<SHA1> > >("RSA/OAEP-MGF1(SHA-1)");
 	RegisterAsymmetricCipherDefaultFactories<DLIES<> >("DLIES(NoCofactorMultiplication, KDF2(SHA-1), XOR, HMAC(SHA-1), DHAES)");
 	RegisterSignatureSchemeDefaultFactories<DSA>("DSA(1363)");
 	RegisterSignatureSchemeDefaultFactories<NR<SHA1> >("NR(1363)/EMSA1(SHA-1)");
 	RegisterSignatureSchemeDefaultFactories<GDSA<SHA1> >("DSA-1363/EMSA1(SHA-1)");
-	RegisterSignatureSchemeDefaultFactories<RSASS<PKCS1v15, MD2> >("RSA/PKCS1-1.5(MD2)");
+	RegisterSignatureSchemeDefaultFactories<RSASS<PKCS1v15, Weak::MD2> >("RSA/PKCS1-1.5(MD2)");
 	RegisterSignatureSchemeDefaultFactories<RSASS<PKCS1v15, SHA1> >("RSA/PKCS1-1.5(SHA-1)");
 	RegisterSignatureSchemeDefaultFactories<ESIGN<SHA1> >("ESIGN/EMSA5-MGF1(SHA-1)");
 	RegisterSignatureSchemeDefaultFactories<RWSS<P1363_EMSA2, SHA1> >("RW/EMSA2(SHA-1)");
 	RegisterSignatureSchemeDefaultFactories<RSASS<PSS, SHA1> >("RSA/PSS-MGF1(SHA-1)");
 	RegisterSymmetricCipherDefaultFactories<SEAL<> >();
 	RegisterSymmetricCipherDefaultFactories<ECB_Mode<SHACAL2> >();
-#ifdef WORD64_AVAILABLE
 	RegisterSymmetricCipherDefaultFactories<ECB_Mode<Camellia> >();
-#endif
 	RegisterSymmetricCipherDefaultFactories<ECB_Mode<TEA> >();
 	RegisterSymmetricCipherDefaultFactories<ECB_Mode<XTEA> >();
 	RegisterSymmetricCipherDefaultFactories<PanamaCipher<LittleEndian> >();
@@ -71,6 +81,7 @@ void RegisterFactories()
 	RegisterSymmetricCipherDefaultFactories<OFB_Mode<AES> >();
 	RegisterSymmetricCipherDefaultFactories<CTR_Mode<AES> >();
 	RegisterSymmetricCipherDefaultFactories<Salsa20>();
+	RegisterSymmetricCipherDefaultFactories<Sosemanuk>();
 
 	s_registered = true;
 }