diff -Nur wml-2.0.11.orig/Makefile.in wml-2.0.11/Makefile.in
--- wml-2.0.11.orig/Makefile.in	2010-09-19 22:29:41.000000000 +0200
+++ wml-2.0.11/Makefile.in	2010-09-19 22:30:45.000000000 +0200
@@ -131,8 +131,6 @@
 	$(INSTALL_DATA) wml_backend/p1_ipp/ipp.1 $(mandir)/man1/wml_p1_ipp.1
 	$(INSTALL_PROGRAM) wml_backend/p2_mp4h/src/mp4h@EXEEXT@ $(libdir)/exec/wml_p2_mp4h@EXEEXT@
 	$(INSTALL_DATA) wml_backend/p2_mp4h/doc/mp4h.1 $(mandir)/man1/wml_p2_mp4h.1
-	$(INSTALL_PROGRAM) wml_backend/p4_gm4/src/m4@EXEEXT@ $(libdir)/exec/wml_p4_gm4@EXEEXT@
-	$(INSTALL_DATA) wml_backend/p4_gm4/doc/m4.txt $(mandir)/$(catdir)1/wml_p4_gm4.1
 	$(INSTALL_SCRIPT) wml_backend/p5_divert/divert.pl $(libdir)/exec/wml_p5_divert
 	$(INSTALL_DATA) wml_backend/p5_divert/divert.1 $(mandir)/man1/wml_p5_divert.1
 	$(INSTALL_SCRIPT) wml_backend/p6_asubst/asubst.pl $(libdir)/exec/wml_p6_asubst
diff -Nur wml-2.0.11.orig/configure wml-2.0.11/configure
--- wml-2.0.11.orig/configure	2010-09-19 22:29:41.000000000 +0200
+++ wml-2.0.11/configure	2010-09-19 22:30:29.000000000 +0200
@@ -274,7 +274,7 @@
 
 ac_unique_file="INSTALL"
 ac_default_prefix=/usr/local
-ac_subdirs_all="$ac_subdirs_all wml_backend/p2_mp4h wml_backend/p4_gm4 wml_aux/iselect wml_common/gd"
+ac_subdirs_all="$ac_subdirs_all wml_backend/p2_mp4h wml_aux/iselect wml_common/gd"
 ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS WML_VERSION VERSION WML_CONFIG_ARGS MAINT built_system built_user built_date libsubdir tmpdir build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os DCOLON CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP RANLIB ac_ct_RANLIB SET_MAKE PATH_PERL perlprog perlvers PERL_OPTS have_getoptlong have_bitvector have_filepathconvert have_imagesize have_io have_termreadkey INSTALLPRIVLIB INSTALLARCHLIB catdir subdirs LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
@@ -2993,7 +2993,7 @@
 
 
 
-subdirs="$subdirs wml_backend/p2_mp4h wml_backend/p4_gm4 wml_aux/iselect wml_common/gd "
+subdirs="$subdirs wml_backend/p2_mp4h wml_aux/iselect wml_common/gd "
 
 
 echo "$as_me:$LINENO: result: " >&5
diff -Nur wml-2.0.11.orig/wml_frontend/wml.src wml-2.0.11/wml_frontend/wml.src
--- wml-2.0.11.orig/wml_frontend/wml.src	2010-09-19 22:29:41.000000000 +0200
+++ wml-2.0.11/wml_frontend/wml.src	2010-09-19 22:32:37.000000000 +0200
@@ -809,7 +809,7 @@
     my ($opt, $from, $to, $tmp) = @_;
     my ($rc);
 
-    $rc = &dosystem("@libdir@/exec/wml_p4_gm4 $opt --prefix-builtins <$from >$to");
+    $rc = &dosystem("@bindir@/gm4 $opt --prefix-builtins <$from >$to");
 
     return $rc;
 }
diff -Nur wml-2.0.11.orig/wml_backend/Makefile.in wml-2.0.11/wml_backend/Makefile.in
--- wml-2.0.11.orig/wml_backend/Makefile.in	2010-09-19 23:01:27.000000000 +0200
+++ wml-2.0.11/wml_backend/Makefile.in	2010-09-19 23:02:00.000000000 +0200
@@ -17,7 +17,6 @@
 SUBDIRS = \
    p1_ipp       \
    p2_mp4h      \
-   p4_gm4       \
    p5_divert    \
    p6_asubst    \
    p7_htmlfix   \