diff -Nurd -x'*~' libxklavier-5.0.orig/configure libxklavier-5.0/configure
--- libxklavier-5.0.orig/configure	2010-01-11 05:02:48.000000000 -0500
+++ libxklavier-5.0/configure	2016-02-15 04:42:23.000000000 -0500
@@ -2831,7 +2831,7 @@
 
 
 # Define the identity of the package.
- PACKAGE='libxklavier'
+ PACKAGE='libxklavier16'
  VERSION='5.0'
 
 
diff -Nurd -x'*~' libxklavier-5.0.orig/doc/reference/Makefile.in libxklavier-5.0/doc/reference/Makefile.in
--- libxklavier-5.0.orig/doc/reference/Makefile.in	2010-01-11 05:02:47.000000000 -0500
+++ libxklavier-5.0/doc/reference/Makefile.in	2010-02-11 06:18:44.000000000 -0500
@@ -256,7 +256,7 @@
 # e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
 # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
 INCLUDES = -I$(top_srcdir) -I$(top_builddir) $(GLIB_CFLAGS)
-GTKDOC_LIBS = $(GLIB_LIBS) -L$(top_builddir)/libxklavier -lxklavier
+GTKDOC_LIBS = $(GLIB_LIBS) $(top_builddir)/libxklavier/libxklavier.la
 @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
diff -Nurd -x'*~' libxklavier-5.0.orig/libxklavier/Makefile.in libxklavier-5.0/libxklavier/Makefile.in
--- libxklavier-5.0.orig/libxklavier/Makefile.in	2010-01-11 05:02:47.000000000 -0500
+++ libxklavier-5.0/libxklavier/Makefile.in	2010-02-11 06:36:49.000000000 -0500
@@ -247,7 +247,7 @@
 @ENABLE_XKB_SUPPORT_TRUE@ENABLE_XKB_SUPPORT_CFLAG = -DENABLE_XKB_SUPPORT=1
 @ENABLE_XMODMAP_SUPPORT_FALSE@ENABLE_XMODMAP_SUPPORT_CFLAG = -DDISABLE_XMODMAP_SUPPORT=1
 @ENABLE_XMODMAP_SUPPORT_TRUE@ENABLE_XMODMAP_SUPPORT_CFLAG = -DENABLE_XMODMAP_SUPPORT=1
-AM_CFLAGS = -Wall -DDATA_DIR=\"$(datadir)/$(PACKAGE)\" \
+AM_CPPFLAGS = -Wall -DDATA_DIR=\"$(datadir)/$(PACKAGE)\" \
   -I. -I$(top_srcdir) $(X_CFLAGS) \
   $(XML_CFLAGS) $(GLIB_CFLAGS) $(XINPUT_CFLAGS) \
   $(LIBXKBFILE_PRESENT_CFLAG) \
@@ -273,7 +273,7 @@
 libxklavier_la_LIBADD = \
  $(XML_LIBS) $(GLIB_LIBS) $(XINPUT_LIBS) \
  $(LIBXKBFILE_PRESENT_LDFLAGS) \
- $(X_LIBS) -lX11 $(LIBICONV) 
+ $(X_LIBS) -lX11 $(LIBICONV) -lintl
 
 EXTRA_DIST = marshal.list
 GLIB_GENMARSHAL = `$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
diff -Nurd -x'*~' libxklavier-5.0.orig/libxklavier.pc.in libxklavier-5.0/libxklavier.pc.in
--- libxklavier-5.0.orig/libxklavier.pc.in	2007-05-31 17:06:08.000000000 -0400
+++ libxklavier-5.0/libxklavier.pc.in	2016-07-07 01:08:00.000000000 -0400
@@ -5,7 +5,7 @@
 
 Name: libxklavier
 Description: libxklavier library
-Requires: libxml-2.0
+Requires.private: x11 gobject-2.0
 Version: @VERSION@
-Libs: -L${libdir} -lxklavier @GLIB_LIBS@ @XML_LIBS@
-Cflags: -I${includedir} @GLIB_CFLAGS@
+Libs: -L${libdir} -lxklavier
+Cflags: -I${includedir}
diff -Nurd -x'*~' libxklavier-5.0.orig/tests/Makefile.in libxklavier-5.0/tests/Makefile.in
--- libxklavier-5.0.orig/tests/Makefile.in	2010-01-11 05:02:47.000000000 -0500
+++ libxklavier-5.0/tests/Makefile.in	2010-02-11 06:36:22.000000000 -0500
@@ -210,7 +210,7 @@
 top_srcdir = @top_srcdir@
 test_config_SOURCES = test_config.c
 test_monitor_SOURCES = test_monitor.c
-AM_CFLAGS = -Wall -I$(top_srcdir) $(X_CFLAGS) $(GLIB_CFLAGS)
+AM_CPPFLAGS = -Wall -I$(top_srcdir) $(X_CFLAGS) $(GLIB_CFLAGS)
 LDADD = $(top_builddir)/libxklavier/libxklavier.la $(X_LIBS) $(GLIB_LIBS)
 all: all-am