diff --git a/devel/gsl/Makefile b/devel/gsl/Makefile
index 2e420acd455..1fa0e025552 100644
--- a/devel/gsl/Makefile
+++ b/devel/gsl/Makefile
@@ -1,13 +1,13 @@
-# $OpenBSD: Makefile,v 1.16 2004/11/23 11:22:02 espie Exp $
+# $OpenBSD: Makefile,v 1.17 2005/05/30 17:58:08 canacar Exp $
 
 COMMENT=	"GNU Scientific Library"
 
-DISTNAME=	gsl-0.6
+DISTNAME=	gsl-1.6
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEWARE:=gsl/}
 HOMEPAGE=	http://sources.redhat.com/gsl/
 
-MAINTAINER=	Bruno Rohee <rohee@openbsd.org>
+MAINTAINER=	Can Erkin Acar <canacar@openbsd.org>
 
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
@@ -17,4 +17,6 @@ WANTLIB=		c m
 
 CONFIGURE_STYLE=	gnu
 
+USE_LIBTOOL=		Yes
+
 .include <bsd.port.mk>
diff --git a/devel/gsl/distinfo b/devel/gsl/distinfo
index dc506795816..084c9e6aff0 100644
--- a/devel/gsl/distinfo
+++ b/devel/gsl/distinfo
@@ -1,4 +1,4 @@
-MD5 (gsl-0.6.tar.gz) = 1081bca46d26dbed01ba8476daa9aaa4
-RMD160 (gsl-0.6.tar.gz) = 6668d6d30bb4d6894eb8d54b0902213668a0298b
-SHA1 (gsl-0.6.tar.gz) = 66fb532b255cc66b931d85836589a23f627676e5
-SIZE (gsl-0.6.tar.gz) = 1696520
+MD5 (gsl-1.6.tar.gz) = 2c63ab9b925a7be70a5a5b4e0a95ea03
+RMD160 (gsl-1.6.tar.gz) = 3058f95961ee42465680d616df69aca1e7fb378b
+SHA1 (gsl-1.6.tar.gz) = ebf287ee2b7195e557985799857b2aaca7b51148
+SIZE (gsl-1.6.tar.gz) = 2294804
diff --git a/devel/gsl/patches/patch-ieee-utils_read_c b/devel/gsl/patches/patch-ieee-utils_read_c
new file mode 100644
index 00000000000..6cf7fdeb090
--- /dev/null
+++ b/devel/gsl/patches/patch-ieee-utils_read_c
@@ -0,0 +1,19 @@
+$OpenBSD: patch-ieee-utils_read_c,v 1.1 2005/05/30 17:58:08 canacar Exp $
+--- ieee-utils/read.c.orig	Sun May 29 18:27:52 2005
++++ ieee-utils/read.c	Sun May 29 18:29:21 2005
+@@ -41,14 +41,12 @@ gsl_ieee_read_mode_string (const char * 
+   int rounding_count = 0 ;
+   int exception_count = 0 ;
+ 
+-  start = (char *) malloc(strlen(description) + 1) ;
++  start = strdup(description) ;
+ 
+   if (start == 0) 
+     {
+       GSL_ERROR ("no memory to parse mode string", GSL_ENOMEM) ;
+     }
+-
+-  strcpy (start, description) ;
+ 
+   p = start ;
+ 
diff --git a/devel/gsl/patches/patch-ltconfig b/devel/gsl/patches/patch-ltconfig
deleted file mode 100644
index 7e7d1496556..00000000000
--- a/devel/gsl/patches/patch-ltconfig
+++ /dev/null
@@ -1,52 +0,0 @@
-$OpenBSD: patch-ltconfig,v 1.1 2001/02/20 17:18:09 danh Exp $
---- ltconfig.orig	Tue Feb 20 12:13:45 2001
-+++ ltconfig	Tue Feb 20 12:15:09 2001
-@@ -1105,6 +1105,9 @@ cygwin* | mingw*)
-     with_gnu_ld=no
-   fi
-   ;;
-+openbsd*)
-+  with_gnu_ld=no
-+  ;;
- 
- esac
- 
-@@ -1391,10 +1394,21 @@ else
-     ;;
- 
-   openbsd*)
--    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
--    hardcode_libdir_flag_spec='-R$libdir'
-     hardcode_direct=yes
-     hardcode_shlibpath_var=no
-+    case "$host_os" in
-+      openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-+       archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
-+       hardcode_libdir_flag_spec='-R$libdir'
-+      ;;
-+      *)
-+       archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts'
-+       hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-+       if [ "`/usr/bin/file /usr/lib/libc.so.* | grep ELF`" != "" ]; then
-+         export_dynamic_flag_spec='${wl}-E'
-+       fi
-+      ;;
-+    esac
-     ;;
- 
-   os2*)
-@@ -1955,13 +1969,10 @@ netbsd*)
- 
- openbsd*)
-   version_type=sunos
--  if test "$with_gnu_ld" = yes; then
--    need_lib_prefix=no
--    need_version=no
--  fi
-   library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
-   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-   shlibpath_var=LD_LIBRARY_PATH
-+  deplibs_check_method='pass_all'
-   ;;
- 
- os2*)
diff --git a/devel/gsl/patches/patch-ltmain.sh b/devel/gsl/patches/patch-ltmain.sh
deleted file mode 100644
index bddc3b965ba..00000000000
--- a/devel/gsl/patches/patch-ltmain.sh
+++ /dev/null
@@ -1,83 +0,0 @@
---- ltmain.sh.orig	Thu Jul 15 15:31:35 1999
-+++ ltmain.sh	Tue Feb 20 12:16:59 2001
-@@ -1073,7 +1073,18 @@ compiler."
- 	    # These systems don't actually have c library (as such)
- 	    continue
- 	    ;;
-+          *-*-openbsd*)
-+            # Do not include libc due to us having libc/libc_r.
-+            continue
-+            ;;
- 	  esac
-+        elif test "$arg" = "-lc_r"; then
-+          case "$host" in
-+          *-*-openbsd*)
-+            # Do not include libc_r directly, use -pthread flag.
-+            continue
-+            ;;
-+          esac
- 	elif test "$arg" = "-lm"; then
- 	  case "$host" in
- 	  *-*-cygwin* | *-*-beos*)
-@@ -1085,6 +1096,10 @@ compiler."
- 	deplibs="$deplibs $arg"
- 	;;
- 
-+      -?thread)
-+        deplibs="$deplibs $arg"
-+        ;;
-+
-       -module)
- 	module=yes
- 	continue
-@@ -1789,6 +1804,9 @@ compiler."
- 	*-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*)
- 	  # these systems don't actually have a c library (as such)!
- 	  ;;
-+        *-*-openbsd*)
-+          # Do not include libc due to us having libc/libc_r.
-+          ;;
- 	*)
- 	  # Add libc to deplibs on all other systems.
- 	  deplibs="$deplibs -lc"
-@@ -3522,40 +3540,6 @@ libdir='$install_libdir'\
-     # Exit here if they wanted silent mode.
-     test "$show" = : && exit 0
- 
--    echo "----------------------------------------------------------------------"
--    echo "Libraries have been installed in:"
--    for libdir in $libdirs; do
--      echo "   $libdir"
--    done
--    echo
--    echo "If you ever happen to want to link against installed libraries"
--    echo "in a given directory, LIBDIR, you must either use libtool, and"
--    echo "specify the full pathname of the library, or use \`-LLIBDIR'"
--    echo "flag during linking and do at least one of the following:"
--    if test -n "$shlibpath_var"; then
--      echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
--      echo "     during execution"
--    fi
--    if test -n "$runpath_var"; then
--      echo "   - add LIBDIR to the \`$runpath_var' environment variable"
--      echo "     during linking"
--    fi
--    if test -n "$hardcode_libdir_flag_spec"; then
--      libdir=LIBDIR
--      eval flag=\"$hardcode_libdir_flag_spec\"
--
--      echo "   - use the \`$flag' linker flag"
--    fi
--    if test -n "$admincmds"; then
--      echo "   - have your system administrator run these commands:$admincmds"
--    fi
--    if test -f /etc/ld.so.conf; then
--      echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
--    fi
--    echo
--    echo "See any operating system documentation about shared libraries for"
--    echo "more information, such as the ld(1) and ld.so(8) manual pages."
--    echo "----------------------------------------------------------------------"
-     exit 0
-     ;;
- 
diff --git a/devel/gsl/pkg/DESCR b/devel/gsl/pkg/DESCR
index fb39c72c6e4..3512cad9241 100644
--- a/devel/gsl/pkg/DESCR
+++ b/devel/gsl/pkg/DESCR
@@ -1,15 +1,21 @@
-This is GSL, the GNU Scientific Library.
+The GNU Scientific Library (GSL) is a numerical library for C and C++
+programmers. It is free software under the GNU General Public License.
+The library provides a wide range of mathematical routines such as
+random number generators, special functions and least-squares
+fitting. There are over 1000 functions in total.
+ 
+The complete range of subject areas covered by the library includes, 
 
-It is still in early stages of development, but it is being placed on
-ftp://alpha.gnu.org/gnu/ in hopes that others might be interested in
-joining the project.
+  Complex Numbers		Roots of Polynomials	Special Functions
+  Vectors and Matrices  	Permutations		Sorting
+  BLAS Support			Linear Algebra		Eigensystems
+  Fast Fourier Transforms 	Quadrature		Random Numbers
+  Quasi-Random Sequences	Random Distributions	Statistics
+  Histograms			N-Tuples		Monte Carlo Integration
+  Simulated Annealing		Differential Equations	Interpolation
+  Numerical Differentiation	Chebyshev Approximation	Series Acceleration
+  Discrete Hankel Transforms	Root-Finding		Minimization
+  Least-Squares Fitting		Physical Constants	IEEE Floating-Point
 
-The random, fft, siman, roots, statistics and specfunc are reasonable
-well developed.  All but the later are documented in gsl-ref.texi.
-
-A test suite is available for most of the libraries.  It can be
-invoked with "make check" in each directory.  All tests can be run
-together with "make check" at the top level.
-
-If you are interested in participating in GSL development, please send
-mail to Mark Galassi -- rosalia@cygnus.com           
+As of 2004, GSL itself is essentially feature complete, the developers
+are not actively working on any major new functionality.
diff --git a/devel/gsl/pkg/PFRAG.shared b/devel/gsl/pkg/PFRAG.shared
index 7fd1ee8593e..37ce95044e5 100644
--- a/devel/gsl/pkg/PFRAG.shared
+++ b/devel/gsl/pkg/PFRAG.shared
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PFRAG.shared,v 1.4 2004/08/09 13:28:31 espie Exp $
-@lib lib/libgsl.so.0.0
-@lib lib/libgslblascblas.so.0.0
-@lib lib/libgslblasnative.so.0.0
+@comment $OpenBSD: PFRAG.shared,v 1.5 2005/05/30 17:58:08 canacar Exp $
+@lib lib/libgsl.so.7.0
+@lib lib/libgslcblas.so.0.0
diff --git a/devel/gsl/pkg/PLIST b/devel/gsl/pkg/PLIST
index 9b023caf434..c687e685b57 100644
--- a/devel/gsl/pkg/PLIST
+++ b/devel/gsl/pkg/PLIST
@@ -1,14 +1,10 @@
-@comment $OpenBSD: PLIST,v 1.5 2004/08/09 13:28:31 espie Exp $
+@comment $OpenBSD: PLIST,v 1.6 2005/05/30 17:58:08 canacar Exp $
+%%SHARED%%
 bin/gsl-config
 bin/gsl-histogram
 bin/gsl-randist
 include/gsl/
 include/gsl/gsl_blas.h
-include/gsl/gsl_blas_raw.h
-include/gsl/gsl_blas_raw_L1.h
-include/gsl/gsl_blas_raw_L2.h
-include/gsl/gsl_blas_raw_L3.h
-include/gsl/gsl_blas_raw_cm.h
 include/gsl/gsl_blas_types.h
 include/gsl/gsl_block.h
 include/gsl/gsl_block_char.h
@@ -27,11 +23,23 @@ include/gsl/gsl_block_uint.h
 include/gsl/gsl_block_ulong.h
 include/gsl/gsl_block_ushort.h
 include/gsl/gsl_cblas.h
+include/gsl/gsl_cdf.h
+include/gsl/gsl_chebyshev.h
+include/gsl/gsl_check_range.h
+include/gsl/gsl_combination.h
 include/gsl/gsl_complex.h
 include/gsl/gsl_complex_math.h
+include/gsl/gsl_const.h
+include/gsl/gsl_const_cgs.h
+include/gsl/gsl_const_cgsm.h
+include/gsl/gsl_const_mks.h
+include/gsl/gsl_const_mksa.h
+include/gsl/gsl_const_num.h
+include/gsl/gsl_deriv.h
 include/gsl/gsl_dft_complex.h
 include/gsl/gsl_dft_complex_float.h
 include/gsl/gsl_dht.h
+include/gsl/gsl_diff.h
 include/gsl/gsl_eigen.h
 include/gsl/gsl_errno.h
 include/gsl/gsl_fft.h
@@ -41,6 +49,7 @@ include/gsl/gsl_fft_halfcomplex.h
 include/gsl/gsl_fft_halfcomplex_float.h
 include/gsl/gsl_fft_real.h
 include/gsl/gsl_fft_real_float.h
+include/gsl/gsl_fit.h
 include/gsl/gsl_heapsort.h
 include/gsl/gsl_histogram.h
 include/gsl/gsl_histogram2d.h
@@ -72,12 +81,19 @@ include/gsl/gsl_monte.h
 include/gsl/gsl_monte_miser.h
 include/gsl/gsl_monte_plain.h
 include/gsl/gsl_monte_vegas.h
+include/gsl/gsl_multifit.h
+include/gsl/gsl_multifit_nlin.h
 include/gsl/gsl_multimin.h
 include/gsl/gsl_multiroots.h
+include/gsl/gsl_nan.h
+include/gsl/gsl_ntuple.h
 include/gsl/gsl_odeiv.h
 include/gsl/gsl_permutation.h
 include/gsl/gsl_permute.h
 include/gsl/gsl_permute_char.h
+include/gsl/gsl_permute_complex_double.h
+include/gsl/gsl_permute_complex_float.h
+include/gsl/gsl_permute_complex_long_double.h
 include/gsl/gsl_permute_double.h
 include/gsl/gsl_permute_float.h
 include/gsl/gsl_permute_int.h
@@ -90,6 +106,9 @@ include/gsl/gsl_permute_ulong.h
 include/gsl/gsl_permute_ushort.h
 include/gsl/gsl_permute_vector.h
 include/gsl/gsl_permute_vector_char.h
+include/gsl/gsl_permute_vector_complex_double.h
+include/gsl/gsl_permute_vector_complex_float.h
+include/gsl/gsl_permute_vector_complex_long_double.h
 include/gsl/gsl_permute_vector_double.h
 include/gsl/gsl_permute_vector_float.h
 include/gsl/gsl_permute_vector_int.h
@@ -101,6 +120,7 @@ include/gsl/gsl_permute_vector_uint.h
 include/gsl/gsl_permute_vector_ulong.h
 include/gsl/gsl_permute_vector_ushort.h
 include/gsl/gsl_poly.h
+include/gsl/gsl_pow_int.h
 include/gsl/gsl_precision.h
 include/gsl/gsl_qrng.h
 include/gsl/gsl_randist.h
@@ -109,7 +129,6 @@ include/gsl/gsl_roots.h
 include/gsl/gsl_sf.h
 include/gsl/gsl_sf_airy.h
 include/gsl/gsl_sf_bessel.h
-include/gsl/gsl_sf_chebyshev.h
 include/gsl/gsl_sf_clausen.h
 include/gsl/gsl_sf_coulomb.h
 include/gsl/gsl_sf_coupling.h
@@ -127,9 +146,9 @@ include/gsl/gsl_sf_gamma.h
 include/gsl/gsl_sf_gegenbauer.h
 include/gsl/gsl_sf_hyperg.h
 include/gsl/gsl_sf_laguerre.h
+include/gsl/gsl_sf_lambert.h
 include/gsl/gsl_sf_legendre.h
 include/gsl/gsl_sf_log.h
-include/gsl/gsl_sf_poly.h
 include/gsl/gsl_sf_pow_int.h
 include/gsl/gsl_sf_psi.h
 include/gsl/gsl_sf_result.h
@@ -163,6 +182,7 @@ include/gsl/gsl_sort_vector_uint.h
 include/gsl/gsl_sort_vector_ulong.h
 include/gsl/gsl_sort_vector_ushort.h
 include/gsl/gsl_specfunc.h
+include/gsl/gsl_spline.h
 include/gsl/gsl_statistics.h
 include/gsl/gsl_statistics_char.h
 include/gsl/gsl_statistics_double.h
@@ -176,7 +196,9 @@ include/gsl/gsl_statistics_uint.h
 include/gsl/gsl_statistics_ulong.h
 include/gsl/gsl_statistics_ushort.h
 include/gsl/gsl_sum.h
+include/gsl/gsl_sys.h
 include/gsl/gsl_test.h
+include/gsl/gsl_types.h
 include/gsl/gsl_vector.h
 include/gsl/gsl_vector_char.h
 include/gsl/gsl_vector_complex.h
@@ -193,13 +215,19 @@ include/gsl/gsl_vector_uchar.h
 include/gsl/gsl_vector_uint.h
 include/gsl/gsl_vector_ulong.h
 include/gsl/gsl_vector_ushort.h
+include/gsl/gsl_version.h
+include/gsl/gsl_wavelet.h
+include/gsl/gsl_wavelet2d.h
 @info info/gsl-ref.info
 lib/libgsl.a
 lib/libgsl.la
-lib/libgslblascblas.a
-lib/libgslblascblas.la
-lib/libgslblasnative.a
-lib/libgslblasnative.la
+lib/libgslcblas.a
+lib/libgslcblas.la
+lib/pkgconfig/
+lib/pkgconfig/gsl.pc
+@man man/man1/gsl-config.1
+@man man/man1/gsl-histogram.1
+@man man/man1/gsl-randist.1
+@man man/man3/gsl.3
 share/aclocal/
 share/aclocal/gsl.m4
-%%SHARED%%