diff --git a/.cvsignore b/.cvsignore
index 9e6d7f1..6d3eed2 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1 @@
-ImageMagick-6.2.8-0.tar.bz2
-ImageMagick-6.3.2-9.tar.bz2
+ImageMagick-6.3.5-9.tar.bz2
diff --git a/ImageMagick-6.3.5-multilib.patch b/ImageMagick-6.3.5-multilib.patch
new file mode 100644
index 0000000..cfb1c84
--- /dev/null
+++ b/ImageMagick-6.3.5-multilib.patch
@@ -0,0 +1,78 @@
+--- ImageMagick-6.3.5-9/magick/Magick-config.in	2007-09-20 16:11:57.000000000 +1000
++++ ImageMagick-6.3.5-9/magick/Magick-config.in	2007-09-20 16:17:18.000000000 +1000
+@@ -15,28 +15,28 @@ fi
+ while test $# -gt 0; do
+   case $1 in
+     --prefix)
+-      echo @PREFIX_DIR@
++      pkg-config --variable prefix ImageMagick
+       ;;
+     --exec-prefix)
+-      echo @EXEC_PREFIX_DIR@
++      pkg-config --variable exec_prefix ImageMagic
+       ;;
+     --version)
+-      echo '@PACKAGE_VERSION@ Q@QuantumDepth@ @MAGICK_HDRI@'
++      pkg-config --modversion ImageMagick
+       ;;
+     --cflags)
+-      echo '@MAGICK_CFLAGS@'
++      pkg-config --cflags ImageMagick
+       ;;
+     --cxxflags)
+-      echo '@MAGICK_CXXFLAGS@'
++      pkg-config --cflags ImageMagick
+       ;;
+     --cppflags)
+-      echo '@MAGICK_CPPFLAGS@'
++      pkg-config --cflags ImageMagick
+       ;;
+     --ldflags)
+-      echo '@MAGICK_LDFLAGS@'
++      pkg-config --libs ImageMagick
+       ;;
+     --libs)
+-      echo '@MAGICK_LIBS@ -lWand -lMagick'
++      pkg-config --libs ImageMagick
+       ;;
+     *)
+       echo "${usage}" 1>&2
+--- ImageMagick-6.3.5-9/wand/Wand-config.in	2007-09-20 16:11:57.000000000 +1000
++++ ImageMagick-6.3.5-9/wand/Wand-config.in	2007-09-20 16:19:17.000000000 +1000
+@@ -15,28 +15,28 @@ fi
+ while test $# -gt 0; do
+   case $1 in
+     --prefix)
+-      echo @PREFIX_DIR@
++      pkg-config --variable prefix Wand
+       ;;
+     --exec-prefix)
+-      echo @EXEC_PREFIX_DIR@
++      pkg-config --variable exec_prefix Wand
+       ;;
+     --version)
+-      echo '@PACKAGE_VERSION@ Q@QuantumDepth@ @MAGICK_HDRI@'
++      pkg-config --modversion Wand
+       ;;
+     --cflags)
+-      echo '@MAGICK_CFLAGS@'
++      pkg-config --cflags Wand
+       ;;
+     --cxxflags)
+-      echo '@MAGICK_CXXFLAGS@'
++      pkg-config --cflags Wand
+       ;;
+     --cppflags)
+-      echo '@MAGICK_CPPFLAGS@'
++      pkg-config --cflags Wand
+       ;;
+     --ldflags)
+-      echo '@MAGICK_LDFLAGS@'
++      pkg-config --libs Wand
+       ;;
+     --libs)
+-      echo '@MAGICK_LIBS@ -lWand -lMagick'
++      pkg-config --libs Wand
+       ;;
+     *)
+       echo "${usage}" 1>&2
diff --git a/ImageMagick-6.3.5-open.patch b/ImageMagick-6.3.5-open.patch
new file mode 100644
index 0000000..04b5d5e
--- /dev/null
+++ b/ImageMagick-6.3.5-open.patch
@@ -0,0 +1,12 @@
+--- ImageMagick-6.3.5-9/magick/delegate.c	2007-09-11 13:20:41.000000000 +1000
++++ ImageMagick-6.3.5-9/magick/delegate.c	2007-09-18 18:27:31.000000000 +1000
+@@ -769,7 +769,8 @@ static void CopyDelegateFile(const char 
+   /*
+     Copy source file to destination.
+   */
+-  destination_file=open(destination,O_WRONLY | O_BINARY | O_CREAT);
++  destination_file=open(destination,O_WRONLY | O_BINARY | O_CREAT,
++			S_IRUSR | S_IWUSR | S_IRGRP );
+   if (destination_file == -1)
+     return;
+   source_file=open(source,O_RDONLY | O_BINARY);
diff --git a/ImageMagick.spec b/ImageMagick.spec
index b5dcd85..2743717 100644
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -1,6 +1,6 @@
 # ImageMagick has adopted a new Version.Patchlevel version numbering system...
 # 5.4.0.3 is actually version 5.4.0, Patchlevel 3.
-%define VER 6.3.2
+%define VER 6.3.5
 %define Patchlevel 9
 Summary: An X application for displaying and manipulating images.
 Name: ImageMagick
@@ -9,7 +9,7 @@ Version: %{VER}.%{Patchlevel}
 %else
 Version: %{VER}
 %endif
-Release: 3%{?dist}
+Release: 1%{?dist}
 License: freeware
 Group: Applications/Multimedia
 %if "%{Patchlevel}" != ""
@@ -18,12 +18,9 @@ Source: ftp://ftp.ImageMagick.org/pub/ImageMagick/ImageMagick-%{VER}-%{Patchleve
 Source: ftp://ftp.ImageMagick.org/pub/ImageMagick/ImageMagick-%{version}.tar.bz2
 %endif
 Source1: magick_small.png
-Patch1: ImageMagick-6.2.1-local_doc.patch
-Patch2: ImageMagick-6.2.8-multilib.patch
-Patch3: ImageMagick-6.3.2-perl-parallel-build.patch
-Patch4: ImageMagick-6.3.2-perl-liblink.patch
-# 235075
-Patch5: ImageMagick-6.2.8-CVE-2007-1797.patch
+Patch1: ImageMagick-6.3.5-multilib.patch
+Patch2: ImageMagick-6.3.5-open.patch
+
 
 
 Url: http://www.imagemagick.org/
@@ -34,7 +31,7 @@ BuildRequires: freetype-devel >= 2.1
 BuildRequires: automake >= 1.7 autoconf >= 2.58 libtool >= 1.5
 BuildRequires: ghostscript-devel
 BuildRequires: perl-devel
-BuildRequires: libwmf-devel
+BuildRequires: libwmf-devel, jasper-devel
 BuildRequires: libX11-devel, libXext-devel, libXt-devel
 BuildRequires: lcms-devel, libxml2-devel, librsvg2-devel
 
@@ -65,6 +62,7 @@ Requires: libtiff-devel
 Requires: libjpeg-devel
 Requires: lcms-devel
 Requires: pkgconfig
+Requires: jasper
 
 %description devel
 ImageMagick-devel contains the static libraries and header files you'll
@@ -121,11 +119,8 @@ however.
 
 %prep
 %setup -q -n %{name}-%{VER}
-%patch1 -p1 -b .local_doc
-%patch2 -p1 -b .multilib
-%patch3 -p1 -b .perl-build
-%patch4 -p1 -b .perl-link
-%patch5 -p1 -b .cve-2007-1797
+%patch1 -p1 -b .multilib
+%patch2 -p1 -b .open_args
 
 %build
 %configure --enable-shared \
@@ -140,7 +135,7 @@ however.
            --with-rsvg \
 	   --with-xml \
            --with-perl-options="INSTALLDIRS=vendor %{?perl_prefix} CC='%__cc -L$PWD/magick/.libs' LDDLFLAGS='-shared -L$PWD/magick/.libs'" \
-           --with-windows-font-dir=%{_datadir}/fonts/default/TrueType \
+           --without-windows-font-dir \
 	   --without-dps
 
 make
@@ -178,7 +173,7 @@ rm -f  $RPM_BUILD_ROOT%{_libdir}/ImageMagick-*/modules*/*/*.a
 rm -f  $RPM_BUILD_ROOT%{_libdir}/*.{a,la}
 
 # fix multilib issues
-%ifarch x86_64 s390x ia64 ppc64
+%ifarch x86_64 s390x ia64 ppc64 alpha
 %define wordsize 64
 %else
 %define wordsize 32
@@ -261,6 +256,12 @@ rm -rf $RPM_BUILD_ROOT
 %doc PerlMagick/demo/ PerlMagick/Changelog PerlMagick/README.txt
 
 %changelog
+* Fri Sep 21 2007 Norm Murray <nmurray@redhat.com> 6.3.5.9-1.fc8
+- rebase to 6.3.5.9
+- fix build with missing open() arg
+- add build require of jasper-devel, remove windows font dir
+- update multilib patch
+
 * Thu Apr  5 2007 Norm Murray <nmurray@redhat.com> 6.3.2.9-3.fc7
 - heap overflows (#235075, CVE-2007-1797)
 
diff --git a/sources b/sources
index 7f6e39f..c804673 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-484cd7b62fac2164e8257449405f2563  ImageMagick-6.2.8-0.tar.bz2
-89e118517c64cac04cedf8746e0f1005  ImageMagick-6.3.2-9.tar.bz2
+d636d2113fbfe7453088bda31aa5ccbc  ImageMagick-6.3.5-9.tar.bz2