diff --git a/ChangeLog b/ChangeLog
index 2dd9f5c0d..c48ce6f69 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2016-09-05  Werner Lemberg  <wl@gnu.org>
+
+	[ftrandom] Minor improvements.
+
+	* src/tools/ftrandom/ftrandom.c (_XOPEN_SOURCE): New macro, set to
+	500.
+
+	* src/tools/ftrandom/Makefile (CFLAGS): Split off include
+	directories to ...
+	(INCLUDES): ... this new variable.
+	(LDFLAGS): New variable.
+	(ftrandom.o, ftrandom): Updated.
+
 2016-09-05  Werner Lemberg  <wl@gnu.org>
 
 	[autofit] Improve Armenian support.
diff --git a/src/tools/ftrandom/Makefile b/src/tools/ftrandom/Makefile
index 61fdf486a..24dc49c56 100644
--- a/src/tools/ftrandom/Makefile
+++ b/src/tools/ftrandom/Makefile
@@ -25,8 +25,9 @@ WFLAGS = -Wmissing-prototypes \
          -Wchar-subscripts \
          -Wsequence-point
 CFLAGS = $(WFLAGS) \
-         -g \
-         -I $(TOP_DIR)/include
+         -g
+INCLUDES = -I $(TOP_DIR)/include
+LDFLAGS =
 LIBS = -lm \
        -lz \
        -lpng \
@@ -36,9 +37,9 @@ LIBS = -lm \
 all: $(OBJ_DIR)/ftrandom
 
 $(OBJ_DIR)/ftrandom.o: $(SRC_DIR)/ftrandom.c
-	$(CC) -c -o $@ $(CFLAGS) $<
+	$(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $<
 
 $(OBJ_DIR)/ftrandom: $(OBJ_DIR)/ftrandom.o libfreetype.a
-	$(CC) -o $(OBJ_DIR)/ftrandom $^ $(LIBS)
+	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
 
 # EOF
diff --git a/src/tools/ftrandom/ftrandom.c b/src/tools/ftrandom/ftrandom.c
index 2ae2a8abf..ff3116909 100644
--- a/src/tools/ftrandom/ftrandom.c
+++ b/src/tools/ftrandom/ftrandom.c
@@ -29,6 +29,9 @@
 /* This file is now part of the FreeType library */
 
 
+#define _XOPEN_SOURCE 500 /* for `kill', `strdup', `random', and `srandom' */
+
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>