diff --git a/network/jabberd/jabberd.cache b/network/jabberd2/jabberd2.cache
similarity index 100%
rename from network/jabberd/jabberd.cache
rename to network/jabberd2/jabberd2.cache
diff --git a/network/jabberd/jabberd.conf b/network/jabberd2/jabberd2.conf
similarity index 94%
rename from network/jabberd/jabberd.conf
rename to network/jabberd2/jabberd2.conf
index 352cb31cd..082329370 100644
--- a/network/jabberd/jabberd.conf
+++ b/network/jabberd2/jabberd2.conf
@@ -1,7 +1,8 @@
-# --- T2-COPYRIGHT-NOTE-BEGIN ---
+# --- SDE-COPYRIGHT-NOTE-BEGIN ---
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 # 
-# T2 SDE: package/.../jabberd/jabberd.conf
+# Filename: package/.../jabberd2/jabberd2.conf
+# Copyright (C) 2007 The OpenSDE Project
 # Copyright (C) 2004 - 2006 The T2 SDE Project
 # 
 # More information can be found in the files COPYING and README.
@@ -10,7 +11,7 @@
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; version 2 of the License. A copy of the
 # GNU General Public License can be found in the file COPYING.
-# --- T2-COPYRIGHT-NOTE-END ---
+# --- SDE-COPYRIGHT-NOTE-END ---
 
 # Unfortunately jabberd uses different package names for the same
 # packages. So we need a way to convert T2 package names to jabberd
diff --git a/network/jabberd/jabberd.desc b/network/jabberd2/jabberd2.desc
similarity index 92%
rename from network/jabberd/jabberd.desc
rename to network/jabberd2/jabberd2.desc
index 371a668ec..f6f66e6f8 100644
--- a/network/jabberd/jabberd.desc
+++ b/network/jabberd2/jabberd2.desc
@@ -2,8 +2,8 @@
 [COPY] --- SDE-COPYRIGHT-NOTE-BEGIN ---
 [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 [COPY] 
-[COPY] Filename: package/.../jabberd/jabberd.desc
-[COPY] Copyright (C) 2006 The OpenSDE Project
+[COPY] Filename: package/.../jabberd2/jabberd2.desc
+[COPY] Copyright (C) 2006 - 2007 The OpenSDE Project
 [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project
 [COPY] 
 [COPY] More information can be found in the files COPYING and README.
diff --git a/network/jabberd/jabberd.init b/network/jabberd2/jabberd2.init
similarity index 85%
rename from network/jabberd/jabberd.init
rename to network/jabberd2/jabberd2.init
index 020b1a9b4..8b81c2dcc 100644
--- a/network/jabberd/jabberd.init
+++ b/network/jabberd2/jabberd2.init
@@ -1,8 +1,9 @@
 #!/bin/bash
-# --- T2-COPYRIGHT-NOTE-BEGIN ---
+# --- SDE-COPYRIGHT-NOTE-BEGIN ---
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 # 
-# T2 SDE: package/.../jabberd/jabberd.init
+# Filename: package/.../jabberd2/jabberd2.init
+# Copyright (C) 2007 The OpenSDE Project
 # Copyright (C) 2004 - 2006 The T2 SDE Project
 # 
 # More information can be found in the files COPYING and README.
@@ -11,7 +12,7 @@
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; version 2 of the License. A copy of the
 # GNU General Public License can be found in the file COPYING.
-# --- T2-COPYRIGHT-NOTE-END ---
+# --- SDE-COPYRIGHT-NOTE-END ---
 #
 # ROCK Linux /etc/rc.d/init.d/jabberd
 #
diff --git a/network/jabberd/postsysfiles.in b/network/jabberd2/postsysfiles.in
similarity index 77%
rename from network/jabberd/postsysfiles.in
rename to network/jabberd2/postsysfiles.in
index 2705fde3b..40370f56d 100644
--- a/network/jabberd/postsysfiles.in
+++ b/network/jabberd2/postsysfiles.in
@@ -1,7 +1,8 @@
-# --- T2-COPYRIGHT-NOTE-BEGIN ---
+# --- SDE-COPYRIGHT-NOTE-BEGIN ---
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 # 
-# T2 SDE: package/.../jabberd/postsysfiles.in
+# Filename: package/.../jabberd2/postsysfiles.in
+# Copyright (C) 2007 The OpenSDE Project
 # Copyright (C) 2004 - 2006 The T2 SDE Project
 # 
 # More information can be found in the files COPYING and README.
@@ -10,7 +11,7 @@
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; version 2 of the License. A copy of the
 # GNU General Public License can be found in the file COPYING.
-# --- T2-COPYRIGHT-NOTE-END ---
+# --- SDE-COPYRIGHT-NOTE-END ---
 
 safe_groupadd jabber 78
 safe_useradd jabber 78 78 "Jabber" /var/empty /bin/false "*"