diff --git a/ChangeLog b/ChangeLog
index 4fa22209d3..792436da10 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1998-05-08  Ulrich Drepper  <drepper@cygnus.com>
+
+	* sysdeps/unix/sysv/linux/syscalls.list: Add capset and capget
+	syscalls.
+
 1998-05-08 16:36  Zack Weinberg  <zack@rabi.phys.columbia.edu>
 
 	* iconvdata/Makefile (generated): Set to *-generated-headers
diff --git a/iconvdata/Makefile b/iconvdata/Makefile
index eca01b3b77..c9eb7804b1 100644
--- a/iconvdata/Makefile
+++ b/iconvdata/Makefile
@@ -270,9 +270,9 @@ perl-generated-headers := koi8-r.h latin-greek.h latin-greek-1.h	 \
 			  iso8859-7.h iso8859-8.h iso8859-10.h		 \
 			  iso8859-7jp.h
 
-generated = $(sed-generated-headers) $(perl-generated-headers)
+generated = $(sed-generated-headers) $(perl-generated-headers) iconv-test.out
 ifdef objpfx
-generated += gconv-modules
+generated += $(objpfx)gconv-modules
 endif
 
 # The headers must be generated before the compilation.
@@ -480,7 +480,6 @@ endif
 
 include ../Rules
 
-tests = iconv-test
 tests: $(objpfx)iconv-test.out
 
 $(objpfx)iconv-test.out: run-iconv-test.sh $(objpfx)gconv-modules \
diff --git a/sysdeps/unix/sysv/linux/syscalls.list b/sysdeps/unix/sysv/linux/syscalls.list
index 507fbc35fc..f606ed10bb 100644
--- a/sysdeps/unix/sysv/linux/syscalls.list
+++ b/sysdeps/unix/sysv/linux/syscalls.list
@@ -2,6 +2,8 @@
 
 adjtimex	adjtime	adjtimex	1	__adjtimex	adjtimex
 bdflush		EXTRA	bdflush		2	bdflush
+capget		EXTRA	capget		2	capget
+capset		EXTRA	capset		2	capset
 create_module	EXTRA	create_module	3	create_module
 delete_module	EXTRA	delete_module	3	delete_module
 fdatasync	-	fdatasync	1	fdatasync