diff --git a/.cvsignore b/.cvsignore
index 838d694..705cb72 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gv-3.6.5.tar.gz
+gv-3.6.6.tar.gz
diff --git a/gv-3.5.8-buffer.patch b/gv-3.5.8-buffer.patch
deleted file mode 100644
index 3f4c66a..0000000
--- a/gv-3.5.8-buffer.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- gv-3.5.8/src/file.c.foo	2002-09-24 17:01:07.000000000 -0400
-+++ gv-3.5.8/src/file.c	2002-09-24 18:29:44.000000000 -0400
-@@ -208,21 +208,13 @@
-       if (strlen(tmpExt)>11) tmpExt[11] = '\0';     /* allow .ps_page_nnn */
-       if (strlen(tmpName)+strlen(tmpExt)>23) tmpName[23-strlen(tmpExt)] = '\0';
-    }
--   {
--      struct stat s;
--      int no_such_file;
--      int i=1;
--      do {
- #ifdef VMS
-          sprintf(tempFilename,"%sgv_%lx_%x_%s_%s.tmp",tmpDirBuf,time(NULL),i,tmpName,tmpExt);
- #else
--         sprintf(tempFilename,"%sgv_%lx_%x_%s.%s.tmp",tmpDirBuf,time(NULL),i,tmpName,tmpExt);
-+         sprintf(tempFilename,"%sgv_%s.%s.XXXXXX",tmpDirBuf,tmpName,tmpExt);
- #endif
--         file_translateTildeInPath(tempFilename);
--         no_such_file = stat(tempFilename,&s);
--         i++;
--      } while (!no_such_file);
--   } 
-+   file_translateTildeInPath(tempFilename);
-+   close(mkstemp(tempFilename));
-    SMESSAGE(tempFilename)
-    tempFilenameP = GV_XtNewString(tempFilename);
-    ENDMESSAGE(file_getTmpFilename)
diff --git a/gv-3.6.5-pkgdatadir.patch b/gv-3.6.5-pkgdatadir.patch
deleted file mode 100644
index 7c9c0b7..0000000
--- a/gv-3.6.5-pkgdatadir.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- gv-3.6.5/src/Makefile.am.pkgdatadir	2008-06-22 04:57:35.000000000 -0600
-+++ gv-3.6.5/src/Makefile.am	2008-07-18 10:22:22.000000000 -0600
-@@ -6,9 +6,9 @@
- 
- # File distribution
- bin_PROGRAMS = gv
--dist_pkglib_DATA = gv_system.ad gv_user.ad gv_class.ad gv_spartan.dat gv_user_res.dat gv_copyright.dat gv_widgetless.dat
-+dist_pkgdata_DATA = gv_system.ad gv_user.ad gv_class.ad gv_spartan.dat gv_user_res.dat gv_copyright.dat gv_widgetless.dat
- 
--appdefaultsdir = $(pkglibdir)
-+appdefaultsdir = $(pkgdatadir)
- 
- appdefaults_DATA = GV
- 
-@@ -30,7 +30,7 @@
- 	     $(srcdir)/gv_intern_res_unix.dat
- 
- # Compilation flags
--AM_CPPFLAGS = -DNON_BLOCKING_IO -DGV_CODE -DGV_CODE -DGV_LIBDIR=\"$(pkglibdir)\" \
-+AM_CPPFLAGS = -DNON_BLOCKING_IO -DGV_CODE -DGV_CODE -DGV_LIBDIR=\"$(pkgdatadir)\" \
-               -I$(top_srcdir)/lib -I$(top_builddir)/lib -g
- 
- 
diff --git a/gv-infopopup-warning-fix.patch b/gv-infopopup-warning-fix.patch
deleted file mode 100644
index cb81f28..0000000
--- a/gv-infopopup-warning-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: src/info.c
-===================================================================
---- src/info.c	(Revision 1)
-+++ src/info.c	(Arbeitskopie)
-@@ -140,7 +140,7 @@
-     XtSetValues(infotext,args,n);
-     XawTextEnableRedisplay(infotext);
-     if (!infoPopupVisible && gv_infoVerbose)
--       if (gv_infoVerbose == 2 || strstr((char*)call_data, "Error:"))
-+       if (gv_infoVerbose == 2 || strstr((char*)call_data, "Error:") || strstr((char*)call_data, "ERROR:") || strstr((char*)call_data, "error:"))
-           cb_popupInfoPopup((Widget)NULL,(XtPointer)NULL,(XtPointer)NULL);
-     ENDMESSAGE(cb_appendInfoPopup)
- }
diff --git a/gv.spec b/gv.spec
index 368ea61..b9d9d27 100644
--- a/gv.spec
+++ b/gv.spec
@@ -1,22 +1,16 @@
 Summary: A X front-end for the Ghostscript PostScript(TM) interpreter
 Name: gv
-Version: 3.6.5
-Release: 4%{?dist}
+Version: 3.6.6
+Release: 1%{?dist}
 License: GPLv3+
 Group: Applications/Publishing
 Requires: ghostscript
 URL: http://www.gnu.org/software/gv/
 Source0: ftp://ftp.gnu.org/gnu/gv/gv-%{version}.tar.gz
-Patch0: gv-3.5.8-buffer.patch
-#Install data files in %{_datadir} not %{_libdir}
-#Sent upstream to bug-gv@gnu.org 20080718
-Patch1: gv-3.6.5-pkgdatadir.patch
-#Uptream patch to fix error reporting
-#https://savannah.gnu.org/bugs/?23865
-Patch2: gv-infopopup-warning-fix.patch
 BuildRequires: /usr/bin/makeinfo
-BuildRequires: Xaw3d-devel, /usr/bin/desktop-file-install
-BuildRequires: automake
+BuildRequires: Xaw3d-devel, libXinerama-devel
+BuildRequires: zlib-devel, bzip2-devel
+BuildRequires: desktop-file-utils
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post): /sbin/install-info, /usr/bin/update-mime-database
 Requires(post): /usr/bin/update-desktop-database
@@ -32,13 +26,9 @@ Gv can display PostScript and PDF documents on an X Window System.
 
 %prep
 %setup -q
-%patch0 -p1 -b .buffer
-%patch1 -p1 -b .pkgdatadir
-%patch2 -p0 -b .infopopup
 
 
 %build
-autoreconf
 %configure
 make %{?_smp_mflags}
 
@@ -102,13 +92,18 @@ fi
 %doc AUTHORS ChangeLog COPYING NEWS README
 %{_bindir}/ghostview
 %{_bindir}/gv
+%{_bindir}/gv-update-userconfig
 %{_datadir}/gv/
 %{_datadir}/applications/fedora-gv.desktop
 %{_datadir}/info/gv.info.gz
 %{_mandir}/man1/gv.*
+%{_mandir}/man1/gv-update-userconfig.*
 
 %changelog
-* Tue Oct 21 2008 Orion Poplawski <orion@cora.nwra.com> 3.6.5-4
+* Tue Oct 21 2008 Orion Poplawski <orion@cora.nwra.com> 3.6.6-1
+- Update to 3.6.6
+- Add extra neede BuildRequires
+- Remove upstreamed patches
 - Fix license - GPLv3+
 
 * Wed Aug 6 2008 Orion Poplawski <orion@cora.nwra.com> 3.6.5-3
diff --git a/sources b/sources
index 34d9e4d..99acfcc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ce3081b1b3e6258607f2de70f39cbcd2  gv-3.6.5.tar.gz
+0b9c02724af876d9e5556c4e957b6343  gv-3.6.6.tar.gz