diff --git a/Makefile.org b/Makefile.org
index 141956adf5..2b9e5f8922 100644
--- a/Makefile.org
+++ b/Makefile.org
@@ -580,7 +580,7 @@ install_docs:
 			grep -v $$filecase "^$$fn\$$" | \
 			(cd $(INSTALL_PREFIX)$(MANDIR)/man$$sec/; \
 			 while read n; do \
-				$$here/util/point.sh $$fn.$${sec}$(MANSUFFIX) $$n.$${sec}$(MANSUFFIX); \
+				$$here/util/point.sh $$fn.$${sec}$(MANSUFFIX) "$$n".$${sec}$(MANSUFFIX); \
 			 done); \
 	done; \
 	for i in doc/crypto/*.pod doc/ssl/*.pod; do \
@@ -596,7 +596,7 @@ install_docs:
 			grep -v $$filecase "^$$fn\$$" | \
 			(cd $(INSTALL_PREFIX)$(MANDIR)/man$$sec/; \
 			 while read n; do \
-				$$here/util/point.sh $$fn.$${sec}$(MANSUFFIX) $$n.$${sec}$(MANSUFFIX); \
+				$$here/util/point.sh $$fn.$${sec}$(MANSUFFIX) "$$n".$${sec}$(MANSUFFIX); \
 			 done); \
 	done
 
diff --git a/util/extract-names.pl b/util/extract-names.pl
index d413a045cc..9f2ad5ef16 100644
--- a/util/extract-names.pl
+++ b/util/extract-names.pl
@@ -9,8 +9,8 @@ while(<STDIN>) {
     } elsif ($name) {
 	if (/ - /) {
 	    s/ - .*//;
-	    s/[ \t,]+/ /g;
-	    push @words, split ' ';
+	    s/,[ \t]+/,/g;
+	    push @words, split ',';
 	}
     }
     if (/^=head1 *NAME *$/) {
diff --git a/util/point.sh b/util/point.sh
index ce7dcc56df..4790e08f8a 100755
--- a/util/point.sh
+++ b/util/point.sh
@@ -1,10 +1,10 @@
 #!/bin/sh
 
-rm -f $2
+rm -f "$2"
 if test "$OSTYPE" = msdosdjgpp; then
-    cp $1 $2
+    cp "$1" "$2"
 else
-    ln -s $1 $2
+    ln -s "$1" "$2"
 fi
 echo "$2 => $1"