--- gnustep-make-2.0.4/FilesystemLayouts/fhs-system~	2007-05-25 15:12:35.000000000 +0200
+++ gnustep-make-2.0.4/FilesystemLayouts/fhs-system	2008-02-18 21:06:51.000000000 +0100
@@ -48,9 +48,9 @@
 GNUSTEP_SYSTEM_LIBRARY=/lib/GNUstep
 GNUSTEP_SYSTEM_HEADERS=/include
 GNUSTEP_SYSTEM_LIBRARIES=/lib
-GNUSTEP_SYSTEM_DOC=/share/GNUstep/Documentation
-GNUSTEP_SYSTEM_DOC_MAN=/man
-GNUSTEP_SYSTEM_DOC_INFO=/info
+GNUSTEP_SYSTEM_DOC=/share/doc/GNUstep
+GNUSTEP_SYSTEM_DOC_MAN=/share/man
+GNUSTEP_SYSTEM_DOC_INFO=/share/info
 
 GNUSTEP_NETWORK_APPS=/local/lib/GNUstep/Applications
 GNUSTEP_NETWORK_ADMIN_APPS=/local/lib/GNUstep/Applications
@@ -60,9 +60,9 @@
 GNUSTEP_NETWORK_LIBRARY=/local/lib/GNUstep
 GNUSTEP_NETWORK_HEADERS=/local/include
 GNUSTEP_NETWORK_LIBRARIES=/local/lib
-GNUSTEP_NETWORK_DOC=/local/share/GNUstep/Documentation
-GNUSTEP_NETWORK_DOC_MAN=/local/man
-GNUSTEP_NETWORK_DOC_INFO=/local/info
+GNUSTEP_NETWORK_DOC=/local/share/doc/GNUstep
+GNUSTEP_NETWORK_DOC_MAN=/local/share/man
+GNUSTEP_NETWORK_DOC_INFO=/local/share/info
 
 GNUSTEP_LOCAL_APPS=/local/lib/GNUstep/Applications
 GNUSTEP_LOCAL_ADMIN_APPS=/local/lib/GNUstep/Applications
@@ -72,9 +72,9 @@
 GNUSTEP_LOCAL_LIBRARY=/local/lib/GNUstep
 GNUSTEP_LOCAL_HEADERS=/local/include
 GNUSTEP_LOCAL_LIBRARIES=/local/lib
-GNUSTEP_LOCAL_DOC=/local/share/GNUstep/Documentation
-GNUSTEP_LOCAL_DOC_MAN=/local/man
-GNUSTEP_LOCAL_DOC_INFO=/local/info
+GNUSTEP_LOCAL_DOC=/local/share/doc/GNUstep
+GNUSTEP_LOCAL_DOC_MAN=/local/share/man
+GNUSTEP_LOCAL_DOC_INFO=/local/share/info
 
 GNUSTEP_USER_DIR_APPS=GNUstep/Applications
 GNUSTEP_USER_DIR_ADMIN_APPS=GNUstep/Applications/Admin