diff --git a/server/process.c b/server/process.c
index 8453f18..c0452d8 100644
--- a/server/process.c
+++ b/server/process.c
@@ -1034,8 +1034,7 @@
         reply->ppid             = process->parent ? get_process_id( process->parent ) : 0;
         reply->exit_code        = process->exit_code;
         reply->priority         = process->priority;
-        reply->process_affinity = process->affinity;
-        reply->system_affinity  = 1;
+        reply->affinity         = process->affinity;
         reply->peb              = process->peb;
         release_object( process );
     }
diff --git a/server/protocol.def b/server/protocol.def
index 118ffc0..61a4e09 100644
--- a/server/protocol.def
+++ b/server/protocol.def
@@ -309,8 +309,7 @@
     process_id_t ppid;             /* server process id of parent */
     int          exit_code;        /* process exit code */
     int          priority;         /* priority class */
-    int          process_affinity; /* process affinity mask */
-    int          system_affinity;  /* system affinity mask */
+    int          affinity;         /* process affinity mask */
     void*        peb;              /* PEB address in process address space */
 @END
 
diff --git a/server/trace.c b/server/trace.c
index 4a28595..db86a58 100644
--- a/server/trace.c
+++ b/server/trace.c
@@ -699,8 +699,7 @@
     fprintf( stderr, " ppid=%04x,", req->ppid );
     fprintf( stderr, " exit_code=%d,", req->exit_code );
     fprintf( stderr, " priority=%d,", req->priority );
-    fprintf( stderr, " process_affinity=%d,", req->process_affinity );
-    fprintf( stderr, " system_affinity=%d,", req->system_affinity );
+    fprintf( stderr, " affinity=%d,", req->affinity );
     fprintf( stderr, " peb=%p", req->peb );
 }