diff --git a/graphics/ImageMagick/pkg/PLIST b/graphics/ImageMagick/pkg/PLIST
index 5df1cc48396..18d40447857 100644
--- a/graphics/ImageMagick/pkg/PLIST
+++ b/graphics/ImageMagick/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.24 2004/07/03 18:44:03 brad Exp $
+@comment $OpenBSD: PLIST,v 1.25 2004/07/14 13:37:08 espie Exp $
 bin/Magick++-config
 bin/Magick-config
 bin/Wand-config
@@ -12,6 +12,7 @@ bin/identify
 bin/import
 bin/mogrify
 bin/montage
+@dir include/Magick++
 include/Magick++.h
 include/Magick++/Blob.h
 include/Magick++/CoderInfo.h
@@ -25,6 +26,7 @@ include/Magick++/Montage.h
 include/Magick++/Pixels.h
 include/Magick++/STL.h
 include/Magick++/TypeMetric.h
+@dir include/magick
 include/magick/ImageMagick.h
 include/magick/PreRvIcccm.h
 include/magick/annotate.h
@@ -90,10 +92,13 @@ include/magick/type.h
 include/magick/utility.h
 include/magick/version.h
 include/magick/xwindow.h
+@dir include/wand
 include/wand/drawing_wand.h
 include/wand/magick_wand.h
 include/wand/pixel_iterator.h
 include/wand/pixel_wand.h
+@dir lib/ImageMagick-${VER}
+@dir lib/ImageMagick-${VER}/config
 lib/ImageMagick-${VER}/config/colors.mgk
 lib/ImageMagick-${VER}/config/configure.mgk
 lib/ImageMagick-${VER}/config/delegates.mgk
@@ -103,13 +108,15 @@ lib/ImageMagick-${VER}/config/type-ghostscript.mgk
 lib/ImageMagick-${VER}/config/type-solaris.mgk
 lib/ImageMagick-${VER}/config/type-windows.mgk
 lib/ImageMagick-${VER}/config/type.mgk
+@comment @dir lib/ImageMagick-${VER}/modules-Q16
+@comment @dir lib/ImageMagick-${VER}/modules-Q16/coders
+@comment @dir lib/ImageMagick-${VER}/modules-Q16/filters
 lib/libMagick++.a
 lib/libMagick++.la
 lib/libMagick.a
 lib/libMagick.la
 lib/libWand.a
 lib/libWand.la
-%%SHARED%%
 lib/pkgconfig/ImageMagick++.pc
 lib/pkgconfig/ImageMagick.pc
 lib/pkgconfig/Wand.pc
@@ -129,13 +136,17 @@ man/man1/mogrify.1
 man/man1/montage.1
 man/man4/miff.4
 man/man5/quantize.5
+@comment @dir share/ImageMagick
+@dir share/ImageMagick-${VER}
 share/ImageMagick-${VER}/LICENSE
 share/ImageMagick-${VER}/Magick.pdf
 share/ImageMagick-${VER}/NOTICE
 share/ImageMagick-${VER}/QuickStart.txt
+@dir share/ImageMagick-${VER}/config
 share/ImageMagick-${VER}/config/coder.mgk
 share/ImageMagick-${VER}/config/log.mgk
 share/ImageMagick-${VER}/config/magic.mgk
+@dir share/ImageMagick-${VER}/images
 share/ImageMagick-${VER}/images/background.gif
 share/ImageMagick-${VER}/images/dogwaffle.png
 share/ImageMagick-${VER}/images/examples.jpg
@@ -145,6 +156,7 @@ share/ImageMagick-${VER}/images/magick-icon.png
 share/ImageMagick-${VER}/images/magick.png
 share/ImageMagick-${VER}/images/networkeleven.png
 share/ImageMagick-${VER}/images/pair.png
+@dir share/ImageMagick-${VER}/images/patterns
 share/ImageMagick-${VER}/images/patterns/bricks.png
 share/ImageMagick-${VER}/images/patterns/checkerboard.png
 share/ImageMagick-${VER}/images/patterns/circles.png
@@ -206,6 +218,7 @@ share/ImageMagick-${VER}/images/star.gif
 share/ImageMagick-${VER}/images/top.gif
 share/ImageMagick-${VER}/images/twi.png
 share/ImageMagick-${VER}/index.html
+@dir share/ImageMagick-${VER}/www
 share/ImageMagick-${VER}/www/Authors.html
 share/ImageMagick-${VER}/www/Changelog.html
 share/ImageMagick-${VER}/www/Copyright.html
@@ -216,6 +229,7 @@ share/ImageMagick-${VER}/www/Install-mac.html
 share/ImageMagick-${VER}/www/Install-unix.html
 share/ImageMagick-${VER}/www/Install-vms.html
 share/ImageMagick-${VER}/www/Install-windows.html
+@dir share/ImageMagick-${VER}/www/Magick++
 share/ImageMagick-${VER}/www/Magick++/Blob.html
 share/ImageMagick-${VER}/www/Magick++/Cache.fig
 share/ImageMagick-${VER}/www/Magick++/Cache.png
@@ -258,6 +272,7 @@ share/ImageMagick-${VER}/www/News.html
 share/ImageMagick-${VER}/www/QuickStart.html
 share/ImageMagick-${VER}/www/README.html
 share/ImageMagick-${VER}/www/animate.html
+@dir share/ImageMagick-${VER}/www/api
 share/ImageMagick-${VER}/www/api.html
 share/ImageMagick-${VER}/www/api/animate.html
 share/ImageMagick-${VER}/www/api/annotate.html
@@ -330,22 +345,4 @@ share/ImageMagick-${VER}/www/sponsor.html
 share/ImageMagick-${VER}/www/tools.html
 share/ImageMagick-${VER}/www/topics.html
 share/ImageMagick-${VER}/www/windows.html
-@dirrm share/ImageMagick-${VER}/www/api
-@dirrm share/ImageMagick-${VER}/www/Magick++
-@dirrm share/ImageMagick-${VER}/www
-@dirrm share/ImageMagick-${VER}/images/patterns
-@dirrm share/ImageMagick-${VER}/images
-@dirrm share/ImageMagick-${VER}/config
-@dirrm share/ImageMagick-${VER}
-@comment @exec mkdir -p %D/share/ImageMagick
-@comment @dirrm share/ImageMagick
-@comment @exec mkdir -p %D/lib/ImageMagick-${VER}/modules-Q16/filters
-@comment @dirrm lib/ImageMagick-${VER}/modules-Q16/filters
-@comment @exec mkdir -p %D/lib/ImageMagick-${VER}/modules-Q16/coders
-@comment @dirrm lib/ImageMagick-${VER}/modules-Q16/coders
-@comment @dirrm lib/ImageMagick-${VER}/modules-Q16
-@dirrm lib/ImageMagick-${VER}/config
-@dirrm lib/ImageMagick-${VER}
-@dirrm include/wand
-@dirrm include/magick
-@dirrm include/Magick++
+%%SHARED%%