diff --git a/package/x11/xorg/apm.patch b/package/x11/xorg/apm.patch
index ebdc6778b..4937bcd6e 100644
--- a/package/x11/xorg/apm.patch
+++ b/package/x11/xorg/apm.patch
@@ -5,7 +5,7 @@
 # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
 # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 # 
-# ROCK Linux: rock-src/package/x11/xfree86/apm.patch
+# ROCK Linux: rock-src/package/x11/xorg/apm.patch
 # ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
 # 
 # This patch file is dual-licensed. It is available under the license the
diff --git a/package/x11/xorg/config.hlp b/package/x11/xorg/config.hlp
index 683525185..cb5fd6a44 100644
--- a/package/x11/xorg/config.hlp
+++ b/package/x11/xorg/config.hlp
@@ -5,7 +5,7 @@
 # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
 # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 # 
-# ROCK Linux: rock-src/package/x11/xfree86/config.hlp
+# ROCK Linux: rock-src/package/x11/xorg/config.hlp
 # ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
 # 
 # This program is free software; you can redistribute it and/or modify
diff --git a/package/x11/xorg/config.in b/package/x11/xorg/config.in
index 7565bd59f..1c261b469 100644
--- a/package/x11/xorg/config.in
+++ b/package/x11/xorg/config.in
@@ -5,7 +5,7 @@
 # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
 # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 # 
-# ROCK Linux: rock-src/package/x11/xfree86/config.in
+# ROCK Linux: rock-src/package/x11/xorg/config.in
 # ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
 # 
 # This program is free software; you can redistribute it and/or modify
diff --git a/package/x11/xorg/imake_rules.patch b/package/x11/xorg/imake_rules.patch
index 1797ca515..04f8ff9c7 100644
--- a/package/x11/xorg/imake_rules.patch
+++ b/package/x11/xorg/imake_rules.patch
@@ -5,7 +5,7 @@
 # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
 # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 # 
-# ROCK Linux: rock-src/package/x11/xfree86/imake_rules.patch
+# ROCK Linux: rock-src/package/x11/xorg/imake_rules.patch
 # ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
 # 
 # This patch file is dual-licensed. It is available under the license the
diff --git a/package/x11/xorg/imake_tmpl.patch b/package/x11/xorg/imake_tmpl.patch
index 6f821e956..2eeb4e236 100644
--- a/package/x11/xorg/imake_tmpl.patch
+++ b/package/x11/xorg/imake_tmpl.patch
@@ -5,7 +5,7 @@
 # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
 # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 # 
-# ROCK Linux: rock-src/package/x11/xfree86/imake_tmpl.patch
+# ROCK Linux: rock-src/package/x11/xorg/imake_tmpl.patch
 # ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
 # 
 # This patch file is dual-licensed. It is available under the license the
diff --git a/package/x11/xorg/imakemdep_ppc.patch b/package/x11/xorg/imakemdep_ppc.patch
index c7a0a20ec..28ebba3d9 100644
--- a/package/x11/xorg/imakemdep_ppc.patch
+++ b/package/x11/xorg/imakemdep_ppc.patch
@@ -5,7 +5,7 @@
 # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
 # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 # 
-# ROCK Linux: rock-src/package/x11/xfree86/imakemdep_ppc.patch
+# ROCK Linux: rock-src/package/x11/xorg/imakemdep_ppc.patch
 # ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
 # 
 # This patch file is dual-licensed. It is available under the license the
diff --git a/package/x11/xorg/macintosh-xkb-us-de-ibook.patch b/package/x11/xorg/macintosh-xkb-us-de-ibook.patch
index 0a36641f3..ce9c0a3ee 100644
--- a/package/x11/xorg/macintosh-xkb-us-de-ibook.patch
+++ b/package/x11/xorg/macintosh-xkb-us-de-ibook.patch
@@ -5,7 +5,7 @@
 # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
 # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 # 
-# ROCK Linux: rock-src/package/x11/xfree86/macintosh-xkb-us-de-ibook.patch
+# ROCK Linux: rock-src/package/x11/xorg/macintosh-xkb-us-de-ibook.patch
 # ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
 # 
 # This patch file is dual-licensed. It is available under the license the
diff --git a/package/x11/xorg/no-fc-cache-run.patch b/package/x11/xorg/no-fc-cache-run.patch
index 84dea914b..915df704c 100644
--- a/package/x11/xorg/no-fc-cache-run.patch
+++ b/package/x11/xorg/no-fc-cache-run.patch
@@ -5,7 +5,7 @@
 # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
 # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 # 
-# ROCK Linux: rock-src/package/x11/xfree86/no-fc-cache-run.patch
+# ROCK Linux: rock-src/package/x11/xorg/no-fc-cache-run.patch
 # ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
 # 
 # This patch file is dual-licensed. It is available under the license the
diff --git a/package/x11/xorg/parse-config b/package/x11/xorg/parse-config
index 665b743d5..44d182534 100644
--- a/package/x11/xorg/parse-config
+++ b/package/x11/xorg/parse-config
@@ -5,7 +5,7 @@
 # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
 # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 # 
-# ROCK Linux: rock-src/package/x11/xfree86/parse-config
+# ROCK Linux: rock-src/package/x11/xorg/parse-config
 # ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
 # 
 # This program is free software; you can redistribute it and/or modify
diff --git a/package/x11/xorg/startwm.patch b/package/x11/xorg/startwm.patch
index 26a3fe4f1..c94cda73f 100644
--- a/package/x11/xorg/startwm.patch
+++ b/package/x11/xorg/startwm.patch
@@ -5,7 +5,7 @@
 # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
 # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 # 
-# ROCK Linux: rock-src/package/x11/xfree86/startwm.patch
+# ROCK Linux: rock-src/package/x11/xorg/startwm.patch
 # ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
 # 
 # This patch file is dual-licensed. It is available under the license the
diff --git a/package/x11/xorg/twm-defaults.patch b/package/x11/xorg/twm-defaults.patch
index 09a20383b..0467243d6 100644
--- a/package/x11/xorg/twm-defaults.patch
+++ b/package/x11/xorg/twm-defaults.patch
@@ -6,7 +6,7 @@
 # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
 # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 # 
-# ROCK Linux: rock-src/package/x11/xfree86/twm-defaults.patch
+# ROCK Linux: rock-src/package/x11/xorg/twm-defaults.patch
 # ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
 # 
 # This patch file is dual-licensed. It is available under the license the
diff --git a/package/x11/xorg/xconsole-pty.patch b/package/x11/xorg/xconsole-pty.patch
index 22ea8172c..a67bd978f 100644
--- a/package/x11/xorg/xconsole-pty.patch
+++ b/package/x11/xorg/xconsole-pty.patch
@@ -5,7 +5,7 @@
 # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
 # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 # 
-# ROCK Linux: rock-src/package/x11/xfree86/xconsole-pty.patch
+# ROCK Linux: rock-src/package/x11/xorg/xconsole-pty.patch
 # ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
 # 
 # This patch file is dual-licensed. It is available under the license the
diff --git a/package/x11/xorg/xterm-ls.patch b/package/x11/xorg/xterm-ls.patch
index 833897c98..077b2b9c5 100644
--- a/package/x11/xorg/xterm-ls.patch
+++ b/package/x11/xorg/xterm-ls.patch
@@ -5,7 +5,7 @@
 # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
 # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 # 
-# ROCK Linux: rock-src/package/x11/xfree86/xterm-ls.patch
+# ROCK Linux: rock-src/package/x11/xorg/xterm-ls.patch
 # ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
 # 
 # This patch file is dual-licensed. It is available under the license the