diff -u ptex-bin-3.1.11+0.04b/debian/control ptex-bin-3.1.11+0.04b/debian/control
--- ptex-bin-3.1.11+0.04b/debian/control
+++ ptex-bin-3.1.11+0.04b/debian/control
@@ -1,7 +1,8 @@
 Source: ptex-bin
 Section: tex
 Priority: optional
-Maintainer: Masayuki Hatta (mhatta) <mhatta@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Masayuki Hatta (mhatta) <mhatta@debian.org>
 Build-Depends: debhelper (>> 4.0.0), texlive-binaries, texlive-extra-utils, texlive-metapost, flex, bison, libkpathsea-dev, ptex-base (>= 2.4), ptex-buildsupport (>= 3.0), libtool
 Standards-Version: 3.7.3
 
diff -u ptex-bin-3.1.11+0.04b/debian/rules ptex-bin-3.1.11+0.04b/debian/rules
--- ptex-bin-3.1.11+0.04b/debian/rules
+++ ptex-bin-3.1.11+0.04b/debian/rules
@@ -68,6 +68,12 @@
 	  patch -p0 -d $(TETEX_SRC_DIR)/texk/web2c/$(PTEX_SRC_DIR)/$(JMPOST_SRC_DIR) < $$f ; \
 	done)
 
+	# Apply patches to web2c source (should be named as *.patch)
+	# Put patches in debian/patches/web2c.
+	(for f in debian/patches/web2c/*.patch ; do \
+	  patch -p0 -d $(TETEX_SRC_DIR)/texk/web2c/ < $$f ; \
+	done)
+
 	# Copy texmf.cnf from your system.
 	cp /usr/share/texmf/web2c/texmf.cnf \
 	  $(TETEX_SRC_DIR)/texk/web2c/$(PTEX_SRC_DIR)/texmf.cnf.orig
diff -u ptex-bin-3.1.11+0.04b/debian/changelog ptex-bin-3.1.11+0.04b/debian/changelog
--- ptex-bin-3.1.11+0.04b/debian/changelog
+++ ptex-bin-3.1.11+0.04b/debian/changelog
@@ -1,3 +1,13 @@
+ptex-bin (3.1.11+0.04b-0.2ubuntu1) quantal; urgency=low
+
+  * Track changes to libkpathsea6 API.
+   - program_invocation_name -> kpse_invocation_name
+  * Fix link order for -l options on splitup.
+  * Add support for patches to web2c.
+  * Sort out now removed kpse_set_prog_name.
+
+ -- Andy Whitcroft <apw@ubuntu.com>  Thu, 21 Jun 2012 16:53:16 +0100
+
 ptex-bin (3.1.11+0.04b-0.2) unstable; urgency=low
 
   * Non-maintainer upload.
diff -u ptex-bin-3.1.11+0.04b/debian/patches/teTeX/splitup.c.patch ptex-bin-3.1.11+0.04b/debian/patches/teTeX/splitup.c.patch
--- ptex-bin-3.1.11+0.04b/debian/patches/teTeX/splitup.c.patch
+++ ptex-bin-3.1.11+0.04b/debian/patches/teTeX/splitup.c.patch
@@ -6,7 +6,7 @@
  
 -char *program_invocation_name;
 +#include <kpathsea/types.h>
-+
++#define program_invocation_name kpse_invocation_name
  int filenumber = 0, ifdef_nesting = 0, lines_in_file = 0;
  char *output_name = NULL;
  boolean has_ini;
only in patch2:
unchanged:
--- ptex-bin-3.1.11+0.04b.orig/debian/patches/pteextra.c-kpse-program-name.patch
+++ ptex-bin-3.1.11+0.04b/debian/patches/pteextra.c-kpse-program-name.patch
@@ -0,0 +1,11 @@
+--- ptexextra.c-orig	2012-06-22 11:18:23.626189357 -0400
++++ ptexextra.c	2012-06-22 11:18:26.586189199 -0400
+@@ -19,6 +19,8 @@
+ #include <kpathsea/variable.h>
+ #include <kpathsea/absolute.h>
+ 
++#define program_invocation_name kpse_invocation_name
++
+ #include <time.h> /* For `struct tm'.  */
+ #if defined (HAVE_SYS_TIME_H)
+ #include <sys/time.h>
only in patch2:
unchanged:
--- ptex-bin-3.1.11+0.04b.orig/debian/patches/jmpost/jmpextra-program-invocation-name.patch
+++ ptex-bin-3.1.11+0.04b/debian/patches/jmpost/jmpextra-program-invocation-name.patch
@@ -0,0 +1,10 @@
+--- jmpextra.c-orig	2012-06-23 05:30:06.171064994 -0400
++++ jmpextra.c	2012-06-23 05:33:12.679067745 -0400
+@@ -26,6 +26,7 @@
+ #include <kpathsea/readable.h>
+ #include <kpathsea/variable.h>
+ #include <kpathsea/absolute.h>
++#define program_invocation_name kpse_invocation_name
+ 
+ #include <time.h> /* For `struct tm'.  */
+ #if defined (HAVE_SYS_TIME_H)
only in patch2:
unchanged:
--- ptex-bin-3.1.11+0.04b.orig/debian/patches/web2c/cpascal.h-kpse_set_program_name.patch
+++ ptex-bin-3.1.11+0.04b/debian/patches/web2c/cpascal.h-kpse_set_program_name.patch
@@ -0,0 +1,11 @@
+--- cpascal.h-orig	2012-06-22 11:38:30.326205966 -0400
++++ cpascal.h	2012-06-22 11:46:03.626209807 -0400
+@@ -199,7 +199,7 @@
+ #define kpsefindtfm	kpse_find_tfm
+ #define kpsefindvf	kpse_find_vf
+ #define kpseinitprog	kpse_init_prog
+-#define kpsesetprogname kpse_set_progname
++#define kpsesetprogname(x) kpse_set_program_name(x, nil)
+ #define kpsesetprogramname kpse_set_program_name
+ #define kpseresetprogramname kpse_reset_program_name
+ #define kpsegfformat	kpse_gf_format
only in patch2:
unchanged:
--- ptex-bin-3.1.11+0.04b.orig/debian/patches/teTeX/splitup-makefile.patch
+++ ptex-bin-3.1.11+0.04b/debian/patches/teTeX/splitup-makefile.patch
@@ -0,0 +1,11 @@
+--- texk/web2c/web2c/Makefile.in-orig	2012-06-22 10:56:39.694171478 -0400
++++ texk/web2c/web2c/Makefile.in	2012-06-22 10:56:59.354164389 -0400
+@@ -37,7 +37,7 @@
+ fixwrites: fixwrites.o kps.o
+ 	$(build_link_command) fixwrites.o kps.o
+ splitup: splitup.o kps.o
+-	$(build_link_command) -lkpathsea splitup.o kps.o
++	$(build_link_command) splitup.o kps.o -lkpathsea
+ regfix: regfix.o kps.o
+ 	$(build_link_command) regfix.o kps.o
+