diff --git a/Formula/pygtk.rb b/Formula/pygtk.rb
index 00e5e22d7e..30fd319900 100644
--- a/Formula/pygtk.rb
+++ b/Formula/pygtk.rb
@@ -13,7 +13,7 @@ class Pygtk < Formula
   depends_on 'libglade' if build.include? 'glade'
 
   option :universal
-  option 'glade', 'Python bindigs for glade. (to `import gtk.glade1)'
+  option 'glade', 'Python bindigs for glade. (to `import gtk.glade`)'
 
   def install
     ENV.append 'CFLAGS', '-ObjC'
@@ -21,6 +21,11 @@ class Pygtk < Formula
     system "./configure", "--disable-dependency-tracking",
                           "--prefix=#{prefix}"
     system "make install"
+
+    # Fixing the pkgconfig file to find codegen, because it was moved from
+    # pygtk to pygobject. But our pkgfiles point into the cellar and in the
+    # pygtk-cellar there is no pygobject.
+    inreplace lib/'pkgconfig/pygtk-2.0.pc', 'codegendir=${datadir}/pygobject/2.0/codegen', "codegendir=#{HOMEBREW_PREFIX}/share/pygobject/2.0/codegen"
   end
 
   def caveats; <<-EOS.undent
diff --git a/Formula/pygtksourceview.rb b/Formula/pygtksourceview.rb
new file mode 100644
index 0000000000..84906d1a3b
--- /dev/null
+++ b/Formula/pygtksourceview.rb
@@ -0,0 +1,32 @@
+require 'formula'
+
+class Pygtksourceview < Formula
+  homepage 'http://projects.gnome.org/gtksourceview/pygtksourceview.html'
+  url 'http://ftp.gnome.org/pub/gnome/sources/pygtksourceview/2.10/pygtksourceview-2.10.0.tar.bz2'
+  sha256 'bfdde2ce4f61d461fb34dece9433cf81a73a9c9de6b62d4eb06177b8c9cec9c7'
+
+  depends_on 'pkg-config' => :build
+  depends_on 'gtksourceview'
+  depends_on 'pygtk'
+
+  def install
+    system "./configure", "--disable-dependency-tracking",
+                          "--prefix=#{prefix}",
+                          "--disable-docs"  # attempts to download chunk.xsl on demand (and sometimes fails)
+    system "make install"
+  end
+
+  def caveats; <<-EOS.undent
+    For non-homebrew Python, you need to amend your PYTHONPATH like so:
+      export PYTHONPATH=#{HOMEBREW_PREFIX}/lib/#{which_python}/site-packages:$PYTHONPATH
+    EOS
+  end
+
+  def which_python
+    "python" + `python -c 'import sys;print(sys.version[:3])'`.strip
+  end
+
+  def test
+    system "python -c 'import gtksourceview2'"
+  end
+end