diff --git a/headers/posix/sys/utsname.h b/headers/posix/sys/utsname.h
index 4c151f84dc..b6f46f8ab3 100644
--- a/headers/posix/sys/utsname.h
+++ b/headers/posix/sys/utsname.h
@@ -1,35 +1,30 @@
 /*
- *
- * Copyright 2004, Haiku Inc. All Rights Reserved.
+ * Copyright 2004-2005, Haiku Inc. All Rights Reserved.
  * Distributed under the terms of the MIT License.
  */
-
 #ifndef _SYS_UTSNAME_H
 #define _SYS_UTSNAME_H
 
-#ifdef __HAIKU__
-#define _SYS_NAMELEN 256
-#else
-#define _SYS_NAMELEN 32		// R5 compatibility
-#endif
+
+#define _SYS_NAMELEN 32
+
+struct utsname {
+	char sysname[_SYS_NAMELEN];		/* Name of the OS */
+	char nodename[_SYS_NAMELEN];	/* Name of this node (network related) */
+	char release[_SYS_NAMELEN];		/* Current release level */
+	char version[_SYS_NAMELEN];		/* Current version level */
+	char machine[_SYS_NAMELEN];		/* Name of the hardware type */
+};
+
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-struct utsname {
-	char sysname[_SYS_NAMELEN];	/* Name of the OS */
-	char nodename[_SYS_NAMELEN];	/* Name of this node (network related) */
-	char release[_SYS_NAMELEN];	/* Current release level */
-	char version[_SYS_NAMELEN];	/* Current version level */
-	char machine[_SYS_NAMELEN];	/* Name of the hardware type */
-};
-
 int uname(struct utsname *);
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif
-
+#endif	/* _SYS_UTSNAME_H */