diff --git a/extra/bootstrap/image/download/download.factor b/extra/bootstrap/image/download/download.factor
index 46aca6cc6b..c2e80fee9a 100644
--- a/extra/bootstrap/image/download/download.factor
+++ b/extra/bootstrap/image/download/download.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 IN: bootstrap.image.download
-USING: http.client checksums checksums.md5 splitting assocs
+USING: http.client checksums checksums.openssl splitting assocs
 kernel io.files bootstrap.image sequences io ;
 
 : url "http://factorcode.org/images/latest/" ;
@@ -12,8 +12,11 @@ kernel io.files bootstrap.image sequences io ;
 
 : need-new-image? ( image -- ? )
     dup exists?
-    [ [ md5 checksum-file hex-string ] [ download-checksums at ] bi = not ]
-    [ drop t ] if ;
+    [
+        [ openssl-md5 checksum-file hex-string ]
+        [ download-checksums at ]
+        bi = not
+    ] [ drop t ] if ;
 
 : download-image ( arch -- )
     boot-image-name dup need-new-image? [
diff --git a/extra/bootstrap/image/upload/upload.factor b/extra/bootstrap/image/upload/upload.factor
index 30d0428744..e78c3541d4 100755
--- a/extra/bootstrap/image/upload/upload.factor
+++ b/extra/bootstrap/image/upload/upload.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: http.client checksums checksums.md5 splitting assocs
+USING: http.client checksums checksums.openssl splitting assocs
 kernel io.files bootstrap.image sequences io namespaces
 io.launcher math io.encodings.ascii ;
 IN: bootstrap.image.upload
@@ -19,7 +19,9 @@ SYMBOL: upload-images-destination
 : compute-checksums ( -- )
     checksums ascii [
         boot-image-names [
-            [ write bl ] [ md5 checksum-file hex-string print ] bi
+            [ write bl ]
+            [ openssl-md5 checksum-file hex-string print ]
+            bi
         ] each
     ] with-file-writer ;