--- util-vserver-0.30.216-pre3002/src/Makefile-files.orig	2012-01-31 23:25:27.728011969 +0100
+++ util-vserver-0.30.216-pre3002/src/Makefile-files	2012-01-31 23:25:42.681286983 +0100
@@ -105,7 +105,7 @@
 			src/context-sync.hc \
 			src/attribute-util.h
 
-pkglib_PROGRAMS +=	src/capchroot \
+pkgbin_PROGRAMS +=	src/capchroot \
 			src/chain-echo \
 			src/chcontext-compat \
 			src/check-unixfile \
@@ -132,7 +132,7 @@
 
 if ENSC_HAVE_C99_COMPILER
 if ENSC_HAVE_CRYPTO
-pkglib_PROGRAMS +=	src/vhashify
+pkgbin_PROGRAMS +=	src/vhashify
 endif ENSC_HAVE_CRYPTO
 endif ENSC_HAVE_C99_COMPILER
 
--- util-vserver-0.30.216-pre3002/scripts/Makefile-files.orig	2012-01-31 23:24:11.208310397 +0100
+++ util-vserver-0.30.216-pre3002/scripts/Makefile-files	2012-01-31 23:24:36.028213599 +0100
@@ -121,9 +121,9 @@
 sbin_SCRIPTS +=			$(scripts_sbin_src_PRGS) $(scripts_sbin_gen_PRGS) \
 				$(scripts_legacy_src_PRGS)
 scripts_sbincfg_DTA =		$(scripts_sbincfg_gen_DTA)
-pkglib_SCRIPTS +=		$(scripts_pkglib_src_SCRPTS)
+pkgdata_SCRIPTS +=		$(scripts_pkglib_src_SCRPTS)
 legacy_SCRIPTS +=		$(scripts_legacy_src_SCRPTS) $(scripts_legacy_gen_SCRPTS)
-pkglib_DATA +=			$(scripts_pkglib_src_DTA) $(scripts_pkglib_gen_DTA)
+pkgdata_DATA +=			$(scripts_pkglib_src_DTA) $(scripts_pkglib_gen_DTA)
 
 CLEANFILES +=			$(scripts_pkglib_gen_DTA) \
 				$(scripts_sbin_gen_PRGS) \
--- util-vserver-0.30.216-pre3002/Makefile.am.orig	2011-11-25 21:27:42.000000000 +0100
+++ util-vserver-0.30.216-pre3002/Makefile.am	2012-01-31 23:23:24.445159440 +0100
@@ -34,9 +34,11 @@
 lib_LTLIBRARIES =
 pkglib_LTLIBRARIES =
 
-pkglib_SCRIPTS =
-pkglib_DATA =		FEATURES.txt
-pkglib_PROGRAMS =
+pkgdatadir = $(pkglibdir)
+pkgbindir = $(pkglibdir)
+pkgdata_SCRIPTS =
+pkgdata_DATA =		FEATURES.txt
+pkgbin_PROGRAMS =
 legacy_SCRIPTS =
 legacy_PROGRAMS =
 
@@ -167,7 +168,7 @@
 vserverpkgdir =		$(vserverdir)/.pkg
 vshelperstatedir =	$(localstatedir)/run/vshelper
 
-fix_SCRPTS		=  $(addprefix $(pkglibdir)/, $(notdir $(pkglib_SCRIPTS))) \
+fix_SCRPTS		=  $(addprefix $(pkglibdir)/, $(notdir $(pkgdata_SCRIPTS))) \
 			   $(addprefix $(legacydir)/, $(notdir $(legacy_SCRIPTS))) \
 			   $(addprefix $(sbindir)/,   $(notdir $(sbin_SCRIPTS))) \
 			   $(addprefix $(initrddir)/, $(notdir $(initrd_SCRIPTS)))
--- util-vserver-0.30.216-pre3002/gentoo/Makefile-files~	2011-11-25 21:27:42.000000000 +0100
+++ util-vserver-0.30.216-pre3002/gentoo/Makefile-files	2012-01-31 23:32:46.972965573 +0100
@@ -29,5 +29,5 @@
 
 if HAVE_GENTOO_INIT
 initrd_SCRIPTS +=	$(gentoo_src_SCRPTS)
-pkglib_SCRIPTS +=	gentoo/bash-wrapper
+pkgdata_SCRIPTS +=	gentoo/bash-wrapper
 endif