diff --git a/ChangeLog b/ChangeLog
index dea287a581..2a5a4004a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2003-05-02  Ulrich Drepper  <drepper@redhat.com>
 
+	* sysdeps/generic/dl-fptr.c (_dl_unmap): Fix typo in test.
+	(_dl_make_fptr): Fix typos introduced in last change.
+
 	* sysdeps/generic/dl-fptr.c: Put back one optimization from the
 	original patch.  Use non-exported symbols.  Mark translatable
 	strings.  Pretty printing.
diff --git a/sysdeps/generic/dl-fptr.c b/sysdeps/generic/dl-fptr.c
index d7763c58e7..f3542bca2e 100644
--- a/sysdeps/generic/dl-fptr.c
+++ b/sysdeps/generic/dl-fptr.c
@@ -17,6 +17,7 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
+#include <libintl.h>
 #include <unistd.h>
 #include <string.h>
 #include <sys/param.h>
@@ -187,7 +188,7 @@ make_fptr_table (struct link_map *map)
 		       PROT_READ | PROT_WRITE, MAP_ANON | MAP_PRIVATE,
 		       -1, 0);
   if (fptr_table == MAP_FAILED)
-    INTUSE(_dl_signal)_error (errno, NULL, NULL,
+    INTUSE(_dl_signal_error) (errno, NULL, NULL,
 			      N_("cannot map pages for fptr table"));
 
   if (COMPARE_AND_SWAP ((ElfW(Addr) *) &map->l_mach.fptr_table,
@@ -282,7 +283,7 @@ _dl_unmap (struct link_map *map)
 	{
 	  *(struct fdesc **) ftab[i] = head;
 	  head = (struct fdesc *) ftab[i];
-	  if (tail = NULL)
+	  if (tail == NULL)
 	    tail = head;
 	}
     }