Index: elfcopy/elfcopy.1
===================================================================
--- elfcopy/elfcopy.1	(revision 3164)
+++ elfcopy/elfcopy.1	(working copy)
@@ -64,6 +64,7 @@
 .Op Fl -change-section-lma Ar section Ns {+|-|=} Ns Ar val
 .Op Fl -change-section-vma Ar section Ns {+|-|=} Ns Ar val
 .Op Fl -gap-fill Ns = Ns Ar val
+.Op Fl -localize-hidden
 .Op Fl -no-adjust-warnings | Fl -no-change-warnings
 .Op Fl -only-keep-debug
 .Op Fl -pad-to Ns = Ns Ar address
@@ -224,6 +225,9 @@
 Fill the gaps between sections with the byte value specified by
 the argument
 .Ar val .
+.It Fl -localize-hidden
+Make all hidden symbols local to the output file.
+This includes symbols with internal visiblity.
 .It Fl -no-adjust-warnings | Fl -no-change-warnings
 Do not issue a warning if the section specified by the options
 .Fl -change-section-address ,
Index: elfcopy/elfcopy.h
===================================================================
--- elfcopy/elfcopy.h	(revision 3164)
+++ elfcopy/elfcopy.h	(working copy)
@@ -216,6 +216,7 @@
 #define	SEC_REMOVE	0x00800000U
 #define	SEC_COPY	0x01000000U
 #define	DISCARD_LLABEL	0x02000000U
+#define	LOCALIZE_HIDDEN	0x04000000U
 
 	int		 flags;		/* elfcopy run control flags. */
 	int64_t		 change_addr;	/* Section address adjustment. */
Index: elfcopy/main.c
===================================================================
--- elfcopy/main.c	(revision 3164)
+++ elfcopy/main.c	(working copy)
@@ -57,6 +57,7 @@
 	ECP_GLOBALIZE_SYMBOLS,
 	ECP_KEEP_SYMBOLS,
 	ECP_KEEP_GLOBAL_SYMBOLS,
+	ECP_LOCALIZE_HIDDEN,
 	ECP_LOCALIZE_SYMBOLS,
 	ECP_NO_CHANGE_WARN,
 	ECP_ONLY_DEBUG,
@@ -134,6 +135,7 @@
 	{"keep-global-symbol", required_argument, NULL, 'G'},
 	{"keep-global-symbols", required_argument, NULL,
 	 ECP_KEEP_GLOBAL_SYMBOLS},
+	{"localize-hidden", no_argument, NULL, ECP_LOCALIZE_HIDDEN},
 	{"localize-symbol", required_argument, NULL, 'L'},
 	{"localize-symbols", required_argument, NULL, ECP_LOCALIZE_SYMBOLS},
 	{"no-adjust-warnings", no_argument, NULL, ECP_NO_CHANGE_WARN},
@@ -348,6 +350,7 @@
 	if (ecp->strip == STRIP_DEBUG ||
 	    ecp->strip == STRIP_UNNEEDED ||
 	    ecp->flags & WEAKEN_ALL ||
+	    ecp->flags & LOCALIZE_HIDDEN ||
 	    ecp->flags & DISCARD_LOCAL ||
 	    ecp->flags & DISCARD_LLABEL ||
 	    ecp->prefix_sym != NULL ||
@@ -870,6 +873,9 @@
 		case ECP_KEEP_GLOBAL_SYMBOLS:
 			parse_symlist_file(ecp, optarg, SYMOP_KEEPG);
 			break;
+		case ECP_LOCALIZE_HIDDEN:
+			ecp->flags |= LOCALIZE_HIDDEN;
+			break;
 		case ECP_LOCALIZE_SYMBOLS:
 			parse_symlist_file(ecp, optarg, SYMOP_LOCALIZE);
 			break;
@@ -1379,6 +1385,8 @@
                                section by VAL.\n\
   --gap-fill=VAL               Fill the gaps between sections with bytes\n\
                                of value VAL.\n\
+  --localize-hidden            Make all hidden symbols local to the output\n\
+                               file.\n\
   --no-adjust-warning| --no-change-warnings\n\
                                Do not issue warnings for non-existent\n\
                                sections.\n\
Index: elfcopy/symbols.c
===================================================================
--- elfcopy/symbols.c	(revision 3164)
+++ elfcopy/symbols.c	(working copy)
@@ -129,6 +129,17 @@
 }
 
 static int
+is_hidden_symbol(unsigned char st_other)
+{
+
+	if (GELF_ST_VISIBILITY(st_other) == STV_HIDDEN ||
+	    GELF_ST_VISIBILITY(st_other) == STV_INTERNAL)
+		return (1);
+
+	return (0);
+}
+
+static int
 is_local_label(const char *name)
 {
 
@@ -457,6 +468,11 @@
 			    lookup_symop_list(ecp, name, SYMOP_KEEPG) == NULL)
 				sym.st_info = GELF_ST_INFO(STB_LOCAL,
 				    GELF_ST_TYPE(sym.st_info));
+			if (ecp->flags & LOCALIZE_HIDDEN &&
+			    sym.st_shndx != SHN_UNDEF &&
+			    is_hidden_symbol(sym.st_other))
+				sym.st_info = GELF_ST_INFO(STB_LOCAL,
+				    GELF_ST_TYPE(sym.st_info));
 		} else {
 			/* STB_LOCAL binding. */
 			if (lookup_symop_list(ecp, name, SYMOP_GLOBALIZE) !=