diff --git a/ChangeLog b/ChangeLog
index d7523e116..74aa2a60d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-12-15  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* util/import_gcry.py: Skip _gcry_rmd160_mixblock and serpent_test. We
+	don't use them.
+
 2011-12-15  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* util/import_gcry.py: Don't add include camellia.h to camellia.c. It's
diff --git a/util/import_gcry.py b/util/import_gcry.py
index ae9602db4..e55ffd97b 100644
--- a/util/import_gcry.py
+++ b/util/import_gcry.py
@@ -190,8 +190,10 @@ for cipher_file in cipher_files:
             if hold:
                 hold = False
                 # We're optimising for size.
-                if not re.match ("(run_selftests|selftest|_gcry_aes_c.._..c|_gcry_[a-z0-9]*_hash_buffer|tripledes_set2keys|do_tripledes_set_extra_info)", line) is None:
+                if not re.match ("(run_selftests|selftest|_gcry_aes_c.._..c|_gcry_[a-z0-9]*_hash_buffer|tripledes_set2keys|do_tripledes_set_extra_info|_gcry_rmd160_mixblock|serpent_test)", line) is None:
                     skip = True
+                    if not re.match ("serpent_test", line) is None:
+                        fw.write ("static const char *serpent_test (void) { return 0; }\n");
                     fname = re.match ("[a-zA-Z0-9_]*", line).group ()
                     chmsg = "(%s): Removed." % fname
                     if nch: