diff --git a/cf b/cf
index 02b233ea7..8a6ff3441 100644
--- a/cf
+++ b/cf
@@ -5,6 +5,7 @@ HDF5=1
 DAP=1
 #CDMR=1
 #RPC=1
+PGI=1
 
 #M32=1
 #M64=1
@@ -13,9 +14,18 @@ DAP=1
 
 cmds=""
 #cmds="all"
-#cmds="all check"
+cmds="all check"
 #cmds="all dist"
 #cmds="all distcheck"
+cmds="$cmds install"
+
+# Test pgi compiler
+if test "x$PGI" = x1 ; then
+PATH="/opt/pgi/linux86/11.1/bin:$PATH"
+CC=pgcc
+else
+CC=gcc
+fi
 
 # Default cases
 PREFIX="/tmp/install/${HOST}"
@@ -26,6 +36,14 @@ MALLOC_CHECK=""
 CPPFLAGS=""
 LDFLAGS=""
 
+if test "x$PGI" = x1 ; then
+CFLAGS="-Msignextend -V -m64 $CFLAGS"
+CPPFLAGS="$CPPFLAGS -DNDEBUG -DpgiFortran"
+LD_LIBRARY_PATH="/usr/local/pgi/linux86-64/11.1/lib:$LD_LIBRARY_PATH"
+PREFIX=/tmp/install/pgi
+fi
+
+
 if test x$M32 = x1 ; then
   PREFIX="/tmp/install32/${HOST}"
   stddir="/share/ed/local/${HOST}_32"
@@ -43,7 +61,9 @@ case "$HOST" in
 	CFLAGS="-std=c99 $CFLAGS"
 	;;
   spock)
-	CFLAGS="-Wdeclaration-after-statement -Wall $CFLAGS"
+	if test "x$PGI" = x ; then
+  	  CFLAGS="-Wdeclaration-after-statement -Wall $CFLAGS"
+	fi
 	;;
   spike)
 	CFLAGS="-Wall $CFLAGS"
@@ -75,6 +95,7 @@ else
 fi
 fi
 
+export CC
 export CPPFLAGS
 export CFLAGS
 export LDFLAGS
@@ -105,7 +126,7 @@ FLAGS="$FLAGS --disable-pnetcdf"
 FLAGS="$FLAGS --enable-extra-tests"
 #FLAGS="$FLAGS --enable-logging"
 
-#FLAGS="$FLAGS --disable-shared"
+FLAGS="$FLAGS --disable-shared"
 #FLAGS="$FLAGS --enable-shared"
 
 if test "x$HDF5" = "x" ; then
diff --git a/man4/guide.doc b/man4/guide.doc
index ea92c8364..40728bb1f 100644
--- a/man4/guide.doc
+++ b/man4/guide.doc
@@ -1836,11 +1836,11 @@ Beginning with netCDF version 4.1, optional support is provided for
 accessing data through OPeNDAP servers using the DAP protocol.
 
 DAP support is automatically enabled if a usable curl library can be
-located using the curl-config program or by the –with-curl-config
-flag. It can forcibly be enabled or disabled using the –enable-dap
+located using the curl-config program.
+DAP support can forcibly be enabled or disabled using the –enable-dap
 flag or the –disable-dap flag, respectively. If enabled, then DAP
 support requires access to the curl library. Refer to the installation
-manual for details The NetCDF Installation and Porting Guide.
+manual for details: The NetCDF Installation and Porting Guide.
 
 DAP uses a data model that is different from that supported by netCDF,
 either classic or enhanced. Generically, the DAP data model is encoded
diff --git a/man4/install.doc b/man4/install.doc
index e6da4a6c1..25a11bc20 100644
--- a/man4/install.doc
+++ b/man4/install.doc
@@ -49,7 +49,9 @@ libraries. (And, optionally, the szlib library).
 Get the HDF5 1.8.8 release. You must also have the zlib compression
 library, version 1.2.5 or later. Both of these packages are available from the
 <a href="ftp://ftp.unidata.ucar.edu/pub/netcdf/netcdf-4">netCDF-4 ftp
-site</a>.
+site</a>. If you wish to use the remote data client code, then you will
+also need libcurl version 7.16.4 or later. Libcurl can be obtained
+from the <a href="http://curl.haxx.se/download.html">curl website</a>.
 
 Make sure you run ``make check'' for the HDF5 and zlib
 distributions. They are very well-behaved distributions, but sometimes