diff --git a/mps/code/lii6gc.gmk b/mps/code/lii6gc.gmk
index b913578a893..91f8f5d9066 100644
--- a/mps/code/lii6gc.gmk
+++ b/mps/code/lii6gc.gmk
@@ -3,28 +3,31 @@
 # lii6gc.gmk: BUILD FOR LINUX/x64/GCC PLATFORM
 #
 # $Id$
-# Copyright (c) 2001 Ravenbrook Limited.  See end of file for license.
+# Copyright (c) 2001-2014 Ravenbrook Limited.  See end of file for license.
 
 PFM = lii6gc
 
-THREADSRC = lockli.c thix.c pthrdext.c
-THREADLIB = -lpthread
+MPMPF = \
+    lockli.c \
+    prmci6li.c \
+    proti6.c \
+    protix.c \
+    protli.c \
+    pthrdext.c \
+    span.c \
+    ssixi6.c \
+    thix.c \
+    vmix.c
 
-MPMPF = ${THREADSRC} vmix.c \
-        protix.c protli.c proti6.c prmci6li.c ssixi6.c span.c
-
-LIBS = -lm ${THREADLIB}
+LIBS = -lm -lpthread
 
 include gc.gmk
-
-CC = cc
-
 include comm.gmk
 
 
 # C. COPYRIGHT AND LICENSE
 #
-# Copyright (C) 2001-2002 Ravenbrook Limited <http://www.ravenbrook.com/>.
+# Copyright (C) 2001-2014 Ravenbrook Limited <http://www.ravenbrook.com/>.
 # All rights reserved.  This is an open source license.  Contact
 # Ravenbrook for commercial licensing options.
 # 
diff --git a/mps/code/lii6ll.gmk b/mps/code/lii6ll.gmk
index 75b298b156e..5988b0c0b17 100644
--- a/mps/code/lii6ll.gmk
+++ b/mps/code/lii6ll.gmk
@@ -3,17 +3,23 @@
 # lii6ll.gmk: BUILD FOR LINUX/x64/Clang PLATFORM
 #
 # $Id$
-# Copyright (c) 2001-2013 Ravenbrook Limited.  See end of file for license.
+# Copyright (c) 2001-2014 Ravenbrook Limited.  See end of file for license.
 
 PFM = lii6ll
 
-THREADSRC = lockli.c thix.c pthrdext.c
-THREADLIB = -lpthread
+MPMPF = \
+    lockli.c \
+    prmci6li.c \
+    proti6.c \
+    protix.c \
+    protli.c \
+    pthrdext.c \
+    span.c \
+    ssixi6.c \
+    thix.c \
+    vmix.c
 
-MPMPF = ${THREADSRC} vmix.c \
-        protix.c protli.c proti6.c prmci6li.c ssixi6.c span.c
-
-LIBS = -lm ${THREADLIB}
+LIBS = -lm -lpthread
 
 include ll.gmk
 include comm.gmk
@@ -21,7 +27,7 @@ include comm.gmk
 
 # C. COPYRIGHT AND LICENSE
 #
-# Copyright (C) 2001-2013 Ravenbrook Limited <http://www.ravenbrook.com/>.
+# Copyright (C) 2001-2014 Ravenbrook Limited <http://www.ravenbrook.com/>.
 # All rights reserved.  This is an open source license.  Contact
 # Ravenbrook for commercial licensing options.
 #