2 files changed, 4 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 2f08ce49002..14a4c4cdfc0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 2012-10-24  Glenn Morris  <rgm@gnu.org>
 
-        * Makefile.in (install-man): Don't apply transform to suffix.
+        * Makefile.in (install-etc, install-man):
+        Don't apply program transform to standard file suffixes.
 
 2012-10-23  Paul Eggert  <eggert@cs.ucla.edu>
 
diff --git a/Makefile.in b/Makefile.in
index d9e7371cf4a..20d680e06ab 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -647,7 +647,8 @@ install-etc:
           ( cd $${thisdir}; ${MKDIR_P} $(DESTDIR)${icondir}/$${dir} ) ; \
           for icon in $${dir}/emacs[.-]*; do \
             [ -r $${icon} ] || continue ; \
-            dest=`echo "$${icon}" | sed -e 's|.*/||' -e '$(TRANSFORM)'` ; \
+            ext=`echo "$${icon}" | sed -e 's|.*\.||'`; \
+            dest=`echo "$${icon}" | sed -e 's|.*/||' -e "s|\.$${ext}$$||" -e '$(TRANSFORM)'`.$${ext} ; \
             ( cd $${thisdir}; \
               ${INSTALL_DATA} ${iconsrcdir}/$${icon} $(DESTDIR)${icondir}/$${dir}/$${dest} ) \
             || exit 1; \