diff --git a/.cvsignore b/.cvsignore
index 0f70a93..e712bdd 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-nco-3.1.5.tar.gz
+nco-3.9.1.tar.bz2
diff --git a/nco.spec b/nco.spec
index ec60b06..d860e33 100644
--- a/nco.spec
+++ b/nco.spec
@@ -1,6 +1,6 @@
 Name:           nco
-Version:        3.1.5
-Release:        3%{?dist}
+Version:        3.9.1
+Release:        1%{?dist}
 Summary:        Suite of programs for manipulating NetCDF/HDF4 files
 Group:          Applications/Engineering
 License:        GPL
@@ -12,19 +12,16 @@ URL:            http://nco.sourceforge.net/
 #    cvs -z3 -d:pserver:anonymous@nco.cvs.sourceforge.net:/cvsroot/nco \
 #        co -r nco-3_1_5 -d nco-%{version} nco
 #    tar -czf nco-%{version}.tar.gz ./nco-%{version}
-Source0:        nco-%{version}.tar.gz
+Source0:        nco-%{version}.tar.bz2
 Patch0:		nco_install_C_headers.patch
-Patch1:         nco_find_udunits-dat.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  bison, flex
-BuildRequires:  netcdf-devel, libtool, automake, autoconf
-#  BuildRequires:  udunits, udunits-devel, opendap-devel
+BuildRequires:  bison, flex, gawk
+BuildRequires:  libtool, automake, autoconf
+BuildRequires:  netcdf-devel, libnc-dap-devel
 BuildRequires:  udunits, udunits-devel
 BuildRequires:  curl-devel, libxml2-devel, librx-devel
-#  Unfortunately, opendap does not build on FC-4 or later.  When 
-#  its fixed, opendap-devel will be listed as a BuildRequires.
-#  In the mean time, nco will be built without opendap support.
+BuildRequires:  antlr
 
 %package devel
 Summary:        Development files for NCO
@@ -52,7 +49,6 @@ This package contains the NCO header files and static libs.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 aclocal
@@ -63,7 +59,7 @@ export CPPFLAGS=-I%{_includedir}/netcdf-3
 export LDFLAGS=-L%{_libdir}/netcdf-3
 export CFLAGS="$RPM_OPT_FLAGS -fPIC"
 export CXXFLAGS="$RPM_OPT_FLAGS -fpermissive -fPIC"
-%configure --includedir=%{_includedir}/nco
+%configure --disable-dependency-tracking --includedir=%{_includedir}/nco
 make %{?_smp_mflags}
 unset CPPFLAGS LDFLAGS CFLAGS CXXFLAGS
 
@@ -109,6 +105,13 @@ fi
 
 
 %changelog
+* Mon Aug 27 2007 - Orion Poplawski <orion@cora.nwra.com> - 3.9.1-1
+- Update to 3.9.1
+- Drop udunits patch no longer needed
+- Add BR libnc-dap-devel to enable DAP support
+- Add BR antlr
+- Add BR gawk
+
 * Sat Sep  2 2006 Ed Hill <ed@eh3.com> - 3.1.5-3
 - br bison as well
 
diff --git a/sources b/sources
index 7d1fa61..2ba3f32 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6a24860c89c4546317784b24e802962a  nco-3.1.5.tar.gz
+62a02fcf375df85569dc720dbb500c7a  nco-3.9.1.tar.bz2