diff --git a/.gitignore b/.gitignore
index 00b3242..e83af7d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 wcslib-4.3.1.tar.gz
 /wcslib-4.5.6.tar.bz2
+/wcslib-4.6.3.tar.bz2
diff --git a/sources b/sources
index 75985d7..91102a1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b50030caa59010f4a50c5947647e431b  wcslib-4.5.6.tar.bz2
+634f449fdd2c741d393ba5adeef2cfb0  wcslib-4.6.3.tar.bz2
diff --git a/wcslib-cross.patch b/wcslib-cross.patch
new file mode 100644
index 0000000..cb74af2
--- /dev/null
+++ b/wcslib-cross.patch
@@ -0,0 +1,48 @@
+diff -ur wcslib-4.6.3/configure wcslib-4.6.3.new/configure
+--- wcslib-4.6.3/configure	2010-11-24 02:35:31.000000000 +0100
++++ wcslib-4.6.3.new/configure	2010-12-13 11:31:39.519768352 +0100
+@@ -9648,7 +9648,7 @@
+   *)
+     # Covers Linux and Solaris at least.
+     SHRLIB="libwcs.so.$V"
+-    SHRLD="$SHRLD -shared -Wl,-h\$(SHRLIB)"
++    SHRLD="$SHRLD $CFLAGS -shared -Wl,-h\$(SHRLIB)"
+     SHRLN="libwcs.so"
+     ;;
+   esac
+diff -ur wcslib-4.6.3/utils/GNUmakefile wcslib-4.6.3.new/utils/GNUmakefile
+--- wcslib-4.6.3/utils/GNUmakefile	2010-11-16 07:16:20.000000000 +0100
++++ wcslib-4.6.3.new/utils/GNUmakefile	2010-12-13 11:44:09.276785040 +0100
+@@ -59,20 +59,20 @@
+ fitshdr : fitshdr.c
+ 	-@ echo ''
+ 	   $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@.o $<
+-	   $(LD) -o $@ $@.o $(LDFLAGS) $(LIBS)
++	   $(LD) $(CFLAGS) -o $@ $@.o $(LDFLAGS) $(LIBS)
+ 	-@ $(RM) $@.o
+ 
+ HPXcvt : HPXcvt.c
+ 	-@ echo ''
+ 	   $(CC) $(CPPFLAGS) $(CFITSIOINC) $(CFLAGS) -c -o $@.o $<
+-	   $(LD) -o $@ $@.o $(LDFLAGS) $(CFITSIOLIB) $(LIBS)
++	   $(LD) $(CFLAGS) -o $@ $@.o $(LDFLAGS) $(CFITSIOLIB) $(LIBS)
+ 	-@ $(RM) $@.o
+ 
+ wcsware : wcsware.c $(GETWCSTAB) $(LIBWCS)
+ 	-@ echo ''
+ 	   $(CC) -DDO_CFITSIO $(CPPFLAGS) -I../pgsbox -I../C $(CFITSIOINC) \
+ 	     $(CFLAGS) -c -o $@.o $<
+-	   $(LD) $(LDFLAGS) -o $@ $@.o $(GETWCSTAB) $(CFITSIOLIB) $(LIBWCS) \
++	   $(LD) $(CFLAGS) $(LDFLAGS) -o $@ $@.o $(GETWCSTAB) $(CFITSIOLIB) $(LIBWCS) \
+ 	     $(FLIBS) $(LIBS)
+ 	-@ $(RM) $@.o
+ 
+@@ -80,7 +80,7 @@
+ 	-@ echo ''
+ 	   $(CC) -DDO_CFITSIO $(CPPFLAGS) -I../pgsbox -I../C $(PGPLOTINC) \
+ 	     $(CFITSIOINC) $(CFLAGS) -c -o $@.o $<
+-	   $(LD) $(LDFLAGS) -o $@ $@.o $(PGSBOXLIB) $(PGPLOTLIB) \
++	   $(LD) $(CFLAGS) $(LDFLAGS) -o $@ $@.o $(PGSBOXLIB) $(PGPLOTLIB) \
+ 	     $(GETWCSTAB) $(CFITSIOLIB) $(LIBWCS) $(FLIBS) $(LIBS)
+ 	-@ $(RM) $@.o
+ 
diff --git a/wcslib.spec b/wcslib.spec
index ade40d0..4a088db 100644
--- a/wcslib.spec
+++ b/wcslib.spec
@@ -1,5 +1,5 @@
 Name: wcslib
-Version: 4.5.6
+Version: 4.6.3
 Release: 1%{?dist}
 Summary: An implementation of the FITS World Coordinate System standard
 
@@ -8,6 +8,7 @@ Group: Development/Libraries
 License: LGPLv3+
 URL: http://www.atnf.csiro.au/people/mcalabre/WCS/
 Source0: ftp://ftp.atnf.csiro.au/pub/software/wcslib/%{name}-%{version}.tar.bz2
+Patch0: wcslib-cross.patch
 BuildRequires: cfitsio-devel zlib-devel
 
 %description
@@ -32,9 +33,10 @@ Utils provided with %{name}
 
 %prep
 %setup -q 
+%patch0 -p1
 
 %build
-%configure
+%configure --disable-fortran
 make %{?_smp_mflags}
 
 %install
@@ -55,6 +57,9 @@ ln -s libwcs.so.%{version} %{buildroot}/%{_libdir}/libwcs.so
 %clean
 rm -rf %{buildroot}
 
+%check
+make check
+
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
@@ -76,6 +81,10 @@ rm -rf %{buildroot}
 %{_bindir}/*
 
 %changelog
+* Tue Nov 09 2010 Sergio Pascual <sergiopr at fedoraproject.org> 4.6.3-1
+- New upstream source
+- Patch to fix problems compiling i686 in x86_64
+
 * Tue Nov 09 2010 Sergio Pascual <sergiopr at fedoraproject.org> 4.5.6-1
 - New upstream source
 - Added pkgconfig file