diff --git a/collects/racket/draw/jpeg.rkt b/collects/racket/draw/jpeg.rkt
index 4fc5bdbd16..a5ad1eecf0 100644
--- a/collects/racket/draw/jpeg.rkt
+++ b/collects/racket/draw/jpeg.rkt
@@ -10,7 +10,7 @@
 (define jpeg-lib 
   (case (system-type)
     [(macosx) (ffi-lib "libjpeg.62")]
-    [(unix) (ffi-lib "libjpeg" '("62"))]
+    [(unix) (ffi-lib "libjpeg" '("62" ""))]
     [(windows) (ffi-lib "libjpeg-7.dll")]))
 
 (define JPEG_LIB_VERSION
diff --git a/collects/racket/draw/png.rkt b/collects/racket/draw/png.rkt
index e89283ec3e..2849867a31 100644
--- a/collects/racket/draw/png.rkt
+++ b/collects/racket/draw/png.rkt
@@ -10,7 +10,11 @@
 (define png-lib 
   (case (system-type)
     [(macosx) (ffi-lib "libpng14" '("14" #f))]
-    [(unix) (ffi-lib "libpng12" '("0"))]
+    [(unix) 
+     (case (string->symbol (path->string (system-library-subpath #f)))
+       [(i386-freebsd) (ffi-lib "libpng")]
+       [else
+	(ffi-lib "libpng12" '("0" ""))])]
     [(windows) 
      (ffi-lib "zlib1.dll")
      (ffi-lib "libpng14-14.dll")]))