Index: /FCKeditor.Java/branches/2.4/java-core/pom.xml
===================================================================
--- /FCKeditor.Java/branches/2.4/java-core/pom.xml	(revision 1948)
+++ /FCKeditor.Java/branches/2.4/java-core/pom.xml	(revision 1949)
@@ -57,8 +57,4 @@
 									value="org.apache.tools.ant.util.regexp.Jdk14RegexpRegexp"
 								/>
-
-								<!--<echo
-									message="Rewriting links in tag reference"
-									/>-->
 								<replaceregexp byline="true" flags="m"
 									file="target/site/tagreference.html"
@@ -140,4 +136,4 @@
 		instance and a Servlet handling server-side user files and folders.
 	</description>
-	<url>http://www.fckeditor.net/java</url>
+	<url>http://java.fckeditor.net</url>
 </project>
Index: /FCKeditor.Java/branches/2.4/java-core/src/main/resources/META-INF/FCKeditor.tld
===================================================================
--- /FCKeditor.Java/branches/2.4/java-core/src/main/resources/META-INF/FCKeditor.tld	(revision 1948)
+++ /FCKeditor.Java/branches/2.4/java-core/src/main/resources/META-INF/FCKeditor.tld	(revision 1949)
@@ -15,5 +15,5 @@
 	<tlib-version>2.4</tlib-version>
 	<short-name>FCK</short-name>
-	<uri>http://www.fckeditor.net/java/tags</uri>
+	<uri>http://java.fckeditor.net</uri>
 	<tag>
 		<description>
Index: /FCKeditor.Java/branches/2.4/java-demo/pom.xml
===================================================================
--- /FCKeditor.Java/branches/2.4/java-demo/pom.xml	(revision 1948)
+++ /FCKeditor.Java/branches/2.4/java-demo/pom.xml	(revision 1949)
@@ -117,4 +117,4 @@
 		preconfigured with the Java library and a recent FCKeditor version.
 	</description>
-	<url>http://www.fckeditor.net/java</url>
+	<url>http://java.fckeditor.net</url>
 </project>
Index: /FCKeditor.Java/branches/2.4/java-demo/src/main/webapp/jsp/sample01.jsp
===================================================================
--- /FCKeditor.Java/branches/2.4/java-demo/src/main/webapp/jsp/sample01.jsp	(revision 1948)
+++ /FCKeditor.Java/branches/2.4/java-demo/src/main/webapp/jsp/sample01.jsp	(revision 1949)
@@ -2,5 +2,5 @@
 <%@ page language="java" contentType="text/html; charset=UTF-8"
 	pageEncoding="UTF-8" import="net.fckeditor.*" %>
-<%@ taglib uri="http://www.fckeditor.net/java/tags" prefix="FCK" %>
+<%@ taglib uri="http://java.fckeditor.net" prefix="FCK" %>
 <%--
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
Index: /FCKeditor.Java/branches/2.4/java-demo/src/main/webapp/jsp/sample02.jsp
===================================================================
--- /FCKeditor.Java/branches/2.4/java-demo/src/main/webapp/jsp/sample02.jsp	(revision 1948)
+++ /FCKeditor.Java/branches/2.4/java-demo/src/main/webapp/jsp/sample02.jsp	(revision 1949)
@@ -2,5 +2,5 @@
 <%@ page language="java" contentType="text/html; charset=UTF-8"
 	pageEncoding="UTF-8" %>
-<%@ taglib uri="http://www.fckeditor.net/java/tags" prefix="FCK" %>
+<%@ taglib uri="http://java.fckeditor.net" prefix="FCK" %>
 <%--
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
Index: /FCKeditor.Java/branches/2.4/java-demo/src/main/webapp/jsp/sample03.jsp
===================================================================
--- /FCKeditor.Java/branches/2.4/java-demo/src/main/webapp/jsp/sample03.jsp	(revision 1948)
+++ /FCKeditor.Java/branches/2.4/java-demo/src/main/webapp/jsp/sample03.jsp	(revision 1949)
@@ -2,5 +2,5 @@
 <%@ page language="java" contentType="text/html; charset=UTF-8"
 	pageEncoding="UTF-8" %>
-<%@ taglib uri="http://www.fckeditor.net/java/tags" prefix="FCK" %>
+<%@ taglib uri="http://java.fckeditor.net" prefix="FCK" %>
 <%--
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
Index: /FCKeditor.Java/branches/2.4/java-demo/src/main/webapp/jsp/sample04.jsp
===================================================================
--- /FCKeditor.Java/branches/2.4/java-demo/src/main/webapp/jsp/sample04.jsp	(revision 1948)
+++ /FCKeditor.Java/branches/2.4/java-demo/src/main/webapp/jsp/sample04.jsp	(revision 1949)
@@ -2,5 +2,5 @@
 <%@ page language="java" contentType="text/html; charset=UTF-8"
 	pageEncoding="UTF-8" %>
-<%@ taglib uri="http://www.fckeditor.net/java/tags" prefix="FCK" %>
+<%@ taglib uri="http://java.fckeditor.net" prefix="FCK" %>
 <%--
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
Index: /FCKeditor.Java/branches/2.4/java-demo/src/main/webapp/jsp/sample05.jsp
===================================================================
--- /FCKeditor.Java/branches/2.4/java-demo/src/main/webapp/jsp/sample05.jsp	(revision 1948)
+++ /FCKeditor.Java/branches/2.4/java-demo/src/main/webapp/jsp/sample05.jsp	(revision 1949)
@@ -2,5 +2,5 @@
 <%@ page language="java" contentType="text/html; charset=UTF-8"
 	pageEncoding="UTF-8" %>
-<%@ taglib uri="http://www.fckeditor.net/java/tags" prefix="FCK" %>
+<%@ taglib uri="http://java.fckeditor.net" prefix="FCK" %>
 <%--
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
Index: /FCKeditor.Java/branches/2.4/java-demo/src/main/webapp/jsp/sample06.jsp
===================================================================
--- /FCKeditor.Java/branches/2.4/java-demo/src/main/webapp/jsp/sample06.jsp	(revision 1948)
+++ /FCKeditor.Java/branches/2.4/java-demo/src/main/webapp/jsp/sample06.jsp	(revision 1949)
@@ -2,5 +2,5 @@
 <%@ page language="java" contentType="text/html; charset=UTF-8"
 	pageEncoding="UTF-8" %>
-<%@ taglib uri="http://www.fckeditor.net/java/tags" prefix="FCK" %>
+<%@ taglib uri="http://java.fckeditor.net" prefix="FCK" %>
 <%--
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
Index: /FCKeditor.Java/branches/2.4/java-demo/src/main/webapp/jsp/sample07.jsp
===================================================================
--- /FCKeditor.Java/branches/2.4/java-demo/src/main/webapp/jsp/sample07.jsp	(revision 1948)
+++ /FCKeditor.Java/branches/2.4/java-demo/src/main/webapp/jsp/sample07.jsp	(revision 1949)
@@ -2,5 +2,5 @@
 <%@ page language="java" contentType="text/html; charset=UTF-8"
 	pageEncoding="UTF-8" %>
-<%@ taglib uri="http://www.fckeditor.net/java/tags" prefix="FCK" %>
+<%@ taglib uri="http://java.fckeditor.net" prefix="FCK" %>
 <%--
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
Index: /FCKeditor.Java/branches/2.4/pom.xml
===================================================================
--- /FCKeditor.Java/branches/2.4/pom.xml	(revision 1948)
+++ /FCKeditor.Java/branches/2.4/pom.xml	(revision 1949)
@@ -56,5 +56,4 @@
 				<artifactId>maven-assembly-plugin</artifactId>
 				<configuration>
-					<!-- FIXME assemblies are broken -->
 					<descriptors>
 						<descriptor>
@@ -212,5 +211,5 @@
 		FCKeditor in your web environment.
 	</description>
-	<url>http://www.fckeditor.net/java</url>
+	<url>http://java.fckeditor.net</url>
 	<inceptionYear>2004</inceptionYear>
 	<licenses>
@@ -221,6 +220,6 @@
 	</licenses>
 	<organization>
-		<name>The FCKeditor Team</name>
-		<url>http://www.fckeditor.net</url>
+		<name>Frederico Caldeira Knabben</name>
+		<url>http://www.fredck.com</url>
 	</organization>
 	<developers>
@@ -230,6 +229,6 @@
 			<email>fredck AT fckeditor.net</email>
 			<url>http://www.fredck.com</url>
-			<organization>FCKeditor</organization>
-			<organizationUrl>http://www.fckeditor.net</organizationUrl>
+			<organization>FredCK.com</organization>
+			<organizationUrl>http://www.fredck.com</organizationUrl>
 			<roles>
 				<role>Head Project Manager</role>
@@ -330,19 +329,19 @@
 	<distributionManagement>
 		<repository>
-			<id>fckeditor-space</id>
+			<id>uni-space</id>
 			<url>
-				scp://java.fckeditor.net/home/mosipov/public_html/m2repo
+				scp://wuhan.mi.fu-berlin.de/home/bude/ossipov/web-home/m2repo
 			</url>
 		</repository>
 		<snapshotRepository>
-			<id>fckeditor-space</id>
+			<id>uni-space</id>
 			<url>
-				scp://java.fckeditor.net/home/mosipov/public_html/m2repo-snapshots
+				scp://wuhan.mi.fu-berlin.de/home/bude/ossipov/web-home/m2repo
 			</url>
 		</snapshotRepository>
 		<site>
-			<id>fckeditor-space</id>
+			<id>uni-space</id>
 			<url>
-				scp://java.fckeditor.net/home/mosipov/public_html/24-beta
+				scp://wuhan.mi.fu-berlin.de/home/bude/ossipov/web-home/fckeditor-java
 			</url>
 		</site>
Index: /FCKeditor.Java/branches/2.4/src/site/apt/installation.apt
===================================================================
--- /FCKeditor.Java/branches/2.4/src/site/apt/installation.apt	(revision 1948)
+++ /FCKeditor.Java/branches/2.4/src/site/apt/installation.apt	(revision 1949)
@@ -43,5 +43,5 @@
       <id>fckeditor-java-releases</id>
       <name>FCKeditor.Java Releases</name>
-      <url>http://www.fckeditor.net/m2repo</url>
+      <url>http://java.fckeditor.net/m2repo</url>
       <layout>default</layout>
     </repository>
Index: /FCKeditor.Java/branches/2.4/src/site/apt/taglibrary.apt
===================================================================
--- /FCKeditor.Java/branches/2.4/src/site/apt/taglibrary.apt	(revision 1948)
+++ /FCKeditor.Java/branches/2.4/src/site/apt/taglibrary.apt	(revision 1949)
@@ -29,5 +29,5 @@
 
 +--------------------------------------------------------------------+
-  <%@ taglib uri="http://www.fckeditor.net/java/tags" prefix="FCK" %>
+  <%@ taglib uri="http://java.fckeditor.net" prefix="FCK" %>
 +--------------------------------------------------------------------+
 
@@ -36,5 +36,5 @@
 +--------------------------------------------------------------------+
   <jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page"
-     xmlns:FCK="http://www.fckeditor.net/java/tags">
+     xmlns:FCK="http://java.fckeditor.net">
 +--------------------------------------------------------------------+