diff --git a/ChangeLog b/ChangeLog
index bcd4e451b2..a6978e644d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2017-06-13  Zack Weinberg  <zackw@panix.com>
+
+	* posix/bits/cpu-set.h: Correct indentation of preprocessor
+	directives.
+
 2017-06-12  Zack Weinberg  <zackw@panix.com>
 
 	* bits/sched.h: Remove __need_schedparam logic and replace with a
diff --git a/posix/bits/cpu-set.h b/posix/bits/cpu-set.h
index f9b11b9714..40914183ea 100644
--- a/posix/bits/cpu-set.h
+++ b/posix/bits/cpu-set.h
@@ -25,15 +25,15 @@
 #endif
 
 /* Size definition for CPU sets.  */
-# define __CPU_SETSIZE	1024
-# define __NCPUBITS	(8 * sizeof (__cpu_mask))
+#define __CPU_SETSIZE	1024
+#define __NCPUBITS	(8 * sizeof (__cpu_mask))
 
 /* Type for array elements in 'cpu_set_t'.  */
 typedef __CPU_MASK_TYPE __cpu_mask;
 
 /* Basic access functions.  */
-# define __CPUELT(cpu)	((cpu) / __NCPUBITS)
-# define __CPUMASK(cpu)	((__cpu_mask) 1 << ((cpu) % __NCPUBITS))
+#define __CPUELT(cpu)	((cpu) / __NCPUBITS)
+#define __CPUMASK(cpu)	((__cpu_mask) 1 << ((cpu) % __NCPUBITS))
 
 /* Data structure to describe CPU mask.  */
 typedef struct
@@ -42,11 +42,11 @@ typedef struct
 } cpu_set_t;
 
 /* Access functions for CPU masks.  */
-# if __GNUC_PREREQ (2, 91)
-#  define __CPU_ZERO_S(setsize, cpusetp) \
+#if __GNUC_PREREQ (2, 91)
+# define __CPU_ZERO_S(setsize, cpusetp) \
   do __builtin_memset (cpusetp, '\0', setsize); while (0)
-# else
-#  define __CPU_ZERO_S(setsize, cpusetp) \
+#else
+# define __CPU_ZERO_S(setsize, cpusetp) \
   do {									      \
     size_t __i;								      \
     size_t __imax = (setsize) / sizeof (__cpu_mask);			      \
@@ -54,22 +54,22 @@ typedef struct
     for (__i = 0; __i < __imax; ++__i)					      \
       __bits[__i] = 0;							      \
   } while (0)
-# endif
-# define __CPU_SET_S(cpu, setsize, cpusetp) \
+#endif
+#define __CPU_SET_S(cpu, setsize, cpusetp) \
   (__extension__							      \
    ({ size_t __cpu = (cpu);						      \
       __cpu / 8 < (setsize)						      \
       ? (((__cpu_mask *) ((cpusetp)->__bits))[__CPUELT (__cpu)]		      \
 	 |= __CPUMASK (__cpu))						      \
       : 0; }))
-# define __CPU_CLR_S(cpu, setsize, cpusetp) \
+#define __CPU_CLR_S(cpu, setsize, cpusetp) \
   (__extension__							      \
    ({ size_t __cpu = (cpu);						      \
       __cpu / 8 < (setsize)						      \
       ? (((__cpu_mask *) ((cpusetp)->__bits))[__CPUELT (__cpu)]		      \
 	 &= ~__CPUMASK (__cpu))						      \
       : 0; }))
-# define __CPU_ISSET_S(cpu, setsize, cpusetp) \
+#define __CPU_ISSET_S(cpu, setsize, cpusetp) \
   (__extension__							      \
    ({ size_t __cpu = (cpu);						      \
       __cpu / 8 < (setsize)						      \
@@ -77,14 +77,14 @@ typedef struct
 	  & __CPUMASK (__cpu))) != 0					      \
       : 0; }))
 
-# define __CPU_COUNT_S(setsize, cpusetp) \
+#define __CPU_COUNT_S(setsize, cpusetp) \
   __sched_cpucount (setsize, cpusetp)
 
-# if __GNUC_PREREQ (2, 91)
-#  define __CPU_EQUAL_S(setsize, cpusetp1, cpusetp2) \
+#if __GNUC_PREREQ (2, 91)
+# define __CPU_EQUAL_S(setsize, cpusetp1, cpusetp2) \
   (__builtin_memcmp (cpusetp1, cpusetp2, setsize) == 0)
-# else
-#  define __CPU_EQUAL_S(setsize, cpusetp1, cpusetp2) \
+#else
+# define __CPU_EQUAL_S(setsize, cpusetp1, cpusetp2) \
   (__extension__							      \
    ({ const __cpu_mask *__arr1 = (cpusetp1)->__bits;			      \
       const __cpu_mask *__arr2 = (cpusetp2)->__bits;			      \
@@ -94,9 +94,9 @@ typedef struct
 	if (__arr1[__i] != __arr2[__i])					      \
 	  break;							      \
       __i == __imax; }))
-# endif
+#endif
 
-# define __CPU_OP_S(setsize, destset, srcset1, srcset2, op) \
+#define __CPU_OP_S(setsize, destset, srcset1, srcset2, op) \
   (__extension__							      \
    ({ cpu_set_t *__dest = (destset);					      \
       const __cpu_mask *__arr1 = (srcset1)->__bits;			      \
@@ -107,10 +107,10 @@ typedef struct
 	((__cpu_mask *) __dest->__bits)[__i] = __arr1[__i] op __arr2[__i];    \
       __dest; }))
 
-# define __CPU_ALLOC_SIZE(count) \
+#define __CPU_ALLOC_SIZE(count) \
   ((((count) + __NCPUBITS - 1) / __NCPUBITS) * sizeof (__cpu_mask))
-# define __CPU_ALLOC(count) __sched_cpualloc (count)
-# define __CPU_FREE(cpuset) __sched_cpufree (cpuset)
+#define __CPU_ALLOC(count) __sched_cpualloc (count)
+#define __CPU_FREE(cpuset) __sched_cpufree (cpuset)
 
 __BEGIN_DECLS