diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index c5d763a..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-vte-0.20.1.tar.bz2
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..38e3b18
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+vte-0.20.5.tar.bz2
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 0f98678..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: vte
-# $Id: Makefile,v 1.1 2004/09/09 14:07:43 cvsdist Exp $
-NAME := vte
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attempt a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
diff --git a/python-env-passing.patch b/python-env-passing.patch
new file mode 100644
index 0000000..e8b4917
--- /dev/null
+++ b/python-env-passing.patch
@@ -0,0 +1,46 @@
+From 3c22f5997c7e11f371c606520daff279d9b613e4 Mon Sep 17 00:00:00 2001
+From: Behdad Esfahbod <behdad@behdad.org>
+Date: Tue, 29 Sep 2009 18:54:30 +0000
+Subject: Bug 587894 - the environment passing with python does no longer work
+
+---
+diff --git a/python/vte.override b/python/vte.override
+index 29c3316..196b935 100644
+--- a/python/vte.override
++++ b/python/vte.override
+@@ -112,7 +112,7 @@ _build_envv(PyObject *py_envv, char ***envv)
+ 	int i, pos, n_envs;
+ 	PyObject *py_dict_k, *py_dict_v;
+ 
+-	if (py_envv == NULL || py_envv != Py_None) {
++	if (py_envv == NULL || py_envv == Py_None) {
+ 		return 0;
+ 	}
+ 
+@@ -122,20 +122,20 @@ _build_envv(PyObject *py_envv, char ***envv)
+ 		pos = 0;
+ 		i = 0;
+ 		while (PyDict_Next(py_envv, &pos, &py_dict_k, &py_dict_v)) {
+-			*envv[i++] = g_strdup_printf("%s=%s",
++			(*envv)[i++] = g_strdup_printf("%s=%s",
+ 				PyString_AsString(py_dict_k),
+ 				PyString_AsString(py_dict_v));
+ 		}
+-		*envv[n_envs] = NULL;
++		(*envv)[n_envs] = NULL;
+ 	} else if (PySequence_Check(py_envv)) {
+ 		n_envs = PySequence_Length(py_envv);
+ 		*envv = g_new(gchar *, n_envs + 1);
+ 		for (i = 0; i < n_envs; i++) {
+ 			PyObject *item = PySequence_GetItem(py_envv, i);
+ 			Py_DECREF(item);  /* PySequence_GetItem INCREF's */
+-			*envv[i] = PyString_AsString(item);
++			(*envv)[i] = PyString_AsString(item);
+ 		}
+-		*envv[n_envs] = NULL;
++		(*envv)[n_envs] = NULL;
+ 	} else {
+ 		PyErr_SetString(PyExc_TypeError,
+ 				"envv must be a sequence or a dictionary");
+--
+cgit v0.8.2
diff --git a/sources b/sources
index 0d4e7ed..19e7acf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c0fe9038978eaeb70abf16cd7f791752  vte-0.20.1.tar.bz2
+90de70ddd1340be308430ded74d6b8d6  vte-0.20.5.tar.bz2
diff --git a/vte.spec b/vte.spec
index c29ee30..f89cd6c 100644
--- a/vte.spec
+++ b/vte.spec
@@ -3,8 +3,8 @@
 %define gtk2_version 2.12.0
 
 Name: vte
-Version: 0.20.1
-Release: 1%{?dist}
+Version: 0.20.5
+Release: 2%{?dist}
 Summary: A terminal emulator
 License: LGPLv2+
 Group: User Interface/X
@@ -22,6 +22,8 @@ BuildRequires: intltool
 # initscripts creates the utmp group
 Prereq: initscripts
 
+Patch1: python-env-passing.patch
+
 %description
 VTE is a terminal emulator widget for use with GTK+ 2.0.
 
@@ -43,6 +45,7 @@ vte.
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build
 PYTHON=%{_bindir}/python`%{__python} -c "import sys ; print sys.version[:3]"`
@@ -108,8 +111,20 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/python*/site-packages/gtk-2.0/*.a
 %doc %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
+* Tue Dec  8 2009 Daniel Drake <dsd@laptop.org> 0.20.5-2
+- Add upstream patch to fix environment bug with Python bindings (#537391)
+
+* Tue Jun  9 2009 Matthias Clasen <mclasen@redhat.com> 0.20.5-1
+- Update to 0.20.5
+
+* Mon Jun  1 2009 Matthias Clasen <mclasen@redhat.com> 0.20.4-1
+- Update to 0.20.4
+- See http://download.gnome.org/sources/vte/0.20/vte-0.20.4.news
+- See http://download.gnome.org/sources/vte/0.20/vte-0.20.3.news
+- See http://download.gnome.org/sources/vte/0.20/vte-0.20.2.news
+
 * Mon Apr 13 2009 Matthias Clasen <mclasen@redhat.com> 0.20.1-1
-- Update to 2.20.1
+- Update to 0.20.1
 - See http://download.gnome.org/sources/vte/0.20/vte-0.20.1.news
 
 * Mon Mar 16 2009 Matthias Clasen <mclasen@redhat.com> 0.20.0-1