diff --git a/.cvsignore b/.cvsignore
index 25f81fe..a578a83 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-xdg-utils-1.0.2.tgz
+xdg-utils-20081121cvs.tgz
diff --git a/sources b/sources
index ac8956c..48b9eb7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-348a5b91dc66426505022c74a64b2940  xdg-utils-1.0.2.tgz
+7a48ac172faa3e8acaf383185b050830  xdg-utils-20081121cvs.tgz
diff --git a/xdg-utils-1.0.1-htmlview.patch b/xdg-utils-1.0.2-htmlview.patch
similarity index 51%
rename from xdg-utils-1.0.1-htmlview.patch
rename to xdg-utils-1.0.2-htmlview.patch
index d85e2c6..7062294 100644
--- a/xdg-utils-1.0.1-htmlview.patch
+++ b/xdg-utils-1.0.2-htmlview.patch
@@ -1,6 +1,7 @@
---- xdg-utils-1.0.1/scripts/xdg-open.htmlview	2007-04-23 08:46:17.000000000 -0500
-+++ xdg-utils-1.0.1/scripts/xdg-open	2007-04-23 08:47:28.000000000 -0500
-@@ -417,7 +417,7 @@
+diff -up xdg-utils/scripts/xdg-open.in.htmlview xdg-utils/scripts/xdg-open.in
+--- xdg-utils/scripts/xdg-open.in.htmlview	2008-01-24 14:24:51.000000000 -0600
++++ xdg-utils/scripts/xdg-open.in	2008-11-21 14:00:34.000000000 -0600
+@@ -130,7 +130,7 @@ detectDE
  if [ x"$DE" = x"" ]; then
      # if BROWSER variable is not set, check some well known browsers instead
      if [ x"$BROWSER" = x"" ]; then
diff --git a/xdg-utils-cvs_checkout.sh b/xdg-utils-cvs_checkout.sh
new file mode 100755
index 0000000..d8b643a
--- /dev/null
+++ b/xdg-utils-cvs_checkout.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+
+MODULE=$(basename $0 -cvs_checkout.sh)
+DATE=$(date +%Y%m%d)
+
+set -x
+
+rm -rf $MODULE
+
+cvs -z3 -d:pserver:anonymous@cvs.freedesktop.org:/cvs/portland checkout -P portland/$MODULE 
+pushd portland
+tar czf ../$MODULE-${DATE}cvs.tgz $MODULE
+popd
+
+rm -rf portland 
diff --git a/xdg-utils.spec b/xdg-utils.spec
index 37ffd94..1b6ffff 100644
--- a/xdg-utils.spec
+++ b/xdg-utils.spec
@@ -1,20 +1,32 @@
 
+%define cvs 20081121cvs
+
 Summary: Basic desktop integration functions 
 Name:    xdg-utils
 Version: 1.0.2
-Release: 4%{?dist}
+Release: 5.%{cvs}%{?dist}
 
 URL:     http://portland.freedesktop.org/ 
+%if 0%{?cvs:1}
+Source0: xdg-utils-%{cvs}.tgz
+Source1: xdg-utils-cvs_checkout.sh
+%else
 Source0: http://portland.freedesktop.org/download/xdg-utils-%{version}%{?beta}.tgz
+%endif
 License: MIT 
 Group:   System Environment/Base
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
-Patch1: xdg-utils-1.0.2-mimeopen.patch
-Patch2: xdg-utils-1.0.1-typo.patch
-Patch3: xdg-utils-1.0.1-htmlview.patch
-Patch4: xdg-utils-1.0.2-CVE-2008-0386.patch
+Patch1: xdg-utils-1.0.2-htmlview.patch
+
+## upstream patches
+Patch101: xdg-utils-1.0.2-mimeopen.patch
+Patch102: xdg-utils-1.0.1-typo.patch
+Patch104: xdg-utils-1.0.2-CVE-2008-0386.patch
+
+BuildRequires: gawk
+BuildRequires: xmlto
 
 Requires: coreutils
 Requires: desktop-file-utils
@@ -53,18 +65,23 @@ The following scripts are provided at this time:
 
 
 %prep
-%setup -q -n %{name}-%{version}%{?beta}
+#setup -q -n %{name}-%{version}%{?beta}
+%setup -q -n %{name}
 
-%patch1 -p1 -b .mimeopen
-%patch2 -p1 -b .typo
-%patch3 -p1 -b .htmlview
-%patch4 -p1 -b .CVE-2008-0386
+%patch1 -p1 -b .htmlview
+
+%if ! 0%{?cvs:1}
+%patch101 -p1 -b .mimeopen
+%patch102 -p1 -b .typo
+%patch104 -p1 -b .CVE-2008-0386
+%endif%
 
 
 %build
 %configure
 
 make %{?_smp_mflags}
+make -C scripts scripts
 
 
 %install
@@ -85,6 +102,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Nov 21 2008 Rex Dieter <rdieter@fedoraproject.org> 1.0.2-5.20081121cvs
+- upstreamed a few more patches, rebase to cvs snapshot
+
 * Fri Jan 25 2008 Lubomir Kundrak <lkundrak@redhat.com> 1.0.2-4
 - Fix for CVE-2008-0386 (#429513)