diff --git a/glibc.spec b/glibc.spec
index 267bad7..e0019ca 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -1010,8 +1010,7 @@ build
 pushd build-%{target}
 $GCC -static -L. -Os -g %{SOURCE2} \
 	-o glibc_post_upgrade.%{_target_cpu} \
-	'-DGCONV_MODULES_DIR="%{_libdir}/gconv"' \
-	'-DICONVCONFIG="%{_sbindir}/iconvconfig.%{_target_cpu}"'
+	'-DGCONV_MODULES_DIR="%{_libdir}/gconv"'
 popd
 
 ##############################################################################
@@ -1254,9 +1253,6 @@ install -m 700 build-%{target}/glibc_post_upgrade.%{_target_cpu} \
 # Strip all of the installed object files.
 strip -g $RPM_BUILD_ROOT%{_libdir}/*.o
 
-# XXX: Ugly hack for buggy rpm. What bug? BZ? Is this fixed?
-ln -f ${RPM_BUILD_ROOT}%{_sbindir}/iconvconfig{,.%{_target_cpu}}
-
 ##############################################################################
 # Install debug copies of unstripped static libraries
 # - This step must be last in order to capture any additional static
diff --git a/glibc_post_upgrade.c b/glibc_post_upgrade.c
index a49f23d..c74d440 100644
--- a/glibc_post_upgrade.c
+++ b/glibc_post_upgrade.c
@@ -12,6 +12,7 @@
 #include <elf.h>
 
 #define LD_SO_CONF "/etc/ld.so.conf"
+#define ICONVCONFIG "/usr/sbin/iconvconfig"
 
 #define verbose_exec(failcode, path...) \
   do							\
@@ -128,9 +129,6 @@ main (void)
 
   if (! utimes (GCONV_MODULES_DIR "/gconv-modules.cache", NULL))
     {
-#ifndef ICONVCONFIG
-#define ICONVCONFIG "/usr/sbin/iconvconfig"
-#endif
       char *iconv_cache = GCONV_MODULES_DIR"/gconv-modules.cache";
       char *iconv_dir = GCONV_MODULES_DIR;
       verbose_exec (113, ICONVCONFIG, "/usr/sbin/iconvconfig",