diff --git a/ChangeLog b/ChangeLog
index fa08368a1c..f77a0603a5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+1998-04-02  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* sysdeps/generic/dl-procinfo.h (_dl_hwcap_string): Provide
+	default.
+
+1998-04-02  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* Makerules (installed-libcs): Fix typo.
+
+1998-04-02  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* iconvdata/Makefile ($(objpfx)UHC.so): Link against libKSC.
+	(UHC-routines): Remove ksc5601.
+
 1998-04-03 16:29  Philip Blundell  <pb@nexus.co.uk>
 
 	* sysdeps/unix/sysv/linux/arm/sysdep.h (PSEUDO): Fix typo
diff --git a/Makerules b/Makerules
index 108b2fe64f..094706bff2 100644
--- a/Makerules
+++ b/Makerules
@@ -649,7 +649,7 @@ endef
 # should install libc.a; this way "make install" in a subdir is guaranteed
 # to install everything it changes.
 ifdef objects
-installed-libcs := $(foreach o,$(filter-out .so,$(object-suffixes-for-libc)),\
+installed-libcs := $(foreach o,$(filter-out .os,$(object-suffixes-for-libc)),\
 			     $(inst_libdir)/$(patsubst %,$(libtype$o),\
 						     $(libprefix)$(libc-name)))
 install: $(installed-libcs)
diff --git a/iconvdata/Makefile b/iconvdata/Makefile
index bf9a25614b..cd635d86d6 100644
--- a/iconvdata/Makefile
+++ b/iconvdata/Makefile
@@ -56,7 +56,7 @@ EBCDIC-AT-DE-A-routines := ebcdic-at-de-a
 EBCDIC-CA-FR-routines := ebcdic-ca-fr
 EUC-KR-routines := euckr
 JOHAB-routines := johab
-UHC-routines := uhc ksc5601
+UHC-routines := uhc
 libJIS-routines := jis0201 jis0208 jis0212
 libKSC-routines := ksc5601
 
@@ -64,9 +64,11 @@ LDFLAGS-EUC-KR.so = -Wl,-rpath,$(gconvdir)
 $(objpfx)EUC-KR.so: $(objpfx)libKSC.so
 LDFLAGS-JOHAB.so = -Wl,-rpath,$(gconvdir)
 $(objpfx)JOHAB.so: $(objpfx)libKSC.so
+LDFLAGS-UHC.so = -Wl,-rpath,$(gconvdir)
+$(objpfx)UHC.so: $(objpfx)libKSC.so
 
-LDFLAGS-libJIS.so = -Wl,-soname,libJIS.so
-LDFLAGS-libKSC.so = -Wl,-soname,libKSC.so
+LDFLAGS-libJIS.so = -Wl,-soname,$(@F)
+LDFLAGS-libKSC.so = -Wl,-soname,$(@F)
 
 distribute := 8bit-generic.c 8bit-gap.c gap.pl gaptab.pl gconv-modules	    \
 	      iso8859-1.c iso8859-2.c iso8859-3.c iso8859-4.c iso8859-5.c   \
diff --git a/sysdeps/generic/dl-procinfo.h b/sysdeps/generic/dl-procinfo.h
index 48936194ac..5592ec00d5 100644
--- a/sysdeps/generic/dl-procinfo.h
+++ b/sysdeps/generic/dl-procinfo.h
@@ -24,6 +24,9 @@
 /* We cannot provide a general printing function.  */
 #define _dl_procinfo(word) -1
 
+/* There are no hardware capabilities defined.  */
+#define _dl_hwcap_string(idx) ""
+
 /* By default there is no important hardware capability.  */
 #define HWCAP_IMPORTANT (0)