diff --git a/ChangeLog b/ChangeLog
index 87dc54759..07592f857 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,7 +3,6 @@
 	* configure.ac: Check alignment of pthread types
 	* configure: Regenerate
 	* Headers/Additions/GNUstepBase/GSConfig.h.in: Record alignment
-	* Headers/Foundation/NSLock.h: Use alignment.
 
 2010-08-18  Richard Frith-Macdonald <rfm@gnu.org>
 
diff --git a/Headers/Additions/GNUstepBase/GSConfig.h.in b/Headers/Additions/GNUstepBase/GSConfig.h.in
index 7f24d9986..8dbd5b94a 100644
--- a/Headers/Additions/GNUstepBase/GSConfig.h.in
+++ b/Headers/Additions/GNUstepBase/GSConfig.h.in
@@ -212,12 +212,10 @@ typedef	gsuaddr gsaddr;
  */
 typedef	struct {
   uint8_t	dummy[@GS_SIZEOF_COND_T@];
-} gs_cond_t;
+} gs_cond_t	__attribute__((aligned (@GS_ALIGNOF_COND_T@)));
 typedef	struct {
   uint8_t	dummy[@GS_SIZEOF_MUTEX_T@];
-} gs_mutex_t;
-#define	GS_ALIGNOF_COND_T @GS_ALIGNOF_COND_T@
-#define	GS_ALIGNOF_MUTEX_T @GS_ALIGNOF_MUTEX_T@
+} gs_mutex_t	__attribute__((aligned (@GS_ALIGNOF_MUTEX_T@)));
 
 #define	OBJC2RUNTIME @OBJC2RUNTIME@
 #define BASE_NATIVE_OBJC_EXCEPTIONS     @BASE_NATIVE_OBJC_EXCEPTIONS@
diff --git a/Headers/Foundation/NSLock.h b/Headers/Foundation/NSLock.h
index 13d4ee519..4c3cd0134 100644
--- a/Headers/Foundation/NSLock.h
+++ b/Headers/Foundation/NSLock.h
@@ -73,7 +73,7 @@ extern "C" {
 {
 #if	GS_EXPOSE(NSLock)
 @private
-  gs_mutex_t	_mutex	__attribute__((aligned(GS_ALIGNOF_MUTEX_T)));
+  gs_mutex_t	_mutex;
   NSString	*_name;
 #endif
 }
@@ -117,8 +117,8 @@ extern "C" {
 {
 #if	GS_EXPOSE(NSCondition)
 @private
-  gs_cond_t	_condition	__attribute__((aligned(GS_ALIGNOF_COND_T)));
-  gs_mutex_t	_mutex	__attribute__((aligned(GS_ALIGNOF_MUTEX_T)));
+  gs_cond_t	_condition;
+  gs_mutex_t	_mutex;
   NSString	*_name;
 #endif
 }
@@ -260,7 +260,7 @@ extern "C" {
 {
 #if	GS_EXPOSE(NSRecursiveLock)
 @private
-  gs_mutex_t	_mutex	__attribute__((aligned(GS_ALIGNOF_MUTEX_T)));
+  gs_mutex_t	_mutex;
   NSString      *_name;
 #endif
 }