diff --git a/collects/racket/draw/unsafe/png.rkt b/collects/racket/draw/unsafe/png.rkt
index 54bf3bf58c..9507c310f3 100644
--- a/collects/racket/draw/unsafe/png.rkt
+++ b/collects/racket/draw/unsafe/png.rkt
@@ -10,9 +10,11 @@
   [(unix)
    ;; Most Linux distros supply "libpng12", while other Unix
    ;; variants often have just "libpng":
-   (with-handlers ([exn:fail:filesystem?
-                    (lambda (exn) (ffi-lib "libpng"))])
-     (ffi-lib "libpng12" '("0" "")))]
+   (ffi-lib "libpng12" '("0" "")
+	    #:fail (lambda ()
+		     (ffi-lib "libpng15" '("15" "")
+			      #:fail (lambda ()
+				       (ffi-lib "libpng")))))]
   [(macosx) (ffi-lib "libpng15.15.dylib")]
   [(windows)
    (ffi-lib "zlib1.dll")