diff --git a/httpchannel-captcha/pom.xml b/httpchannel-captcha/pom.xml
index 73532cd..6cde1f4 100644
--- a/httpchannel-captcha/pom.xml
+++ b/httpchannel-captcha/pom.xml
@@ -23,18 +23,4 @@
 			<version>1.0.1-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
-	
-	<build>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>com.github.github</groupId>
-					<artifactId>site-maven-plugin</artifactId>
-					<configuration>
-						<path>/${project.parent.artifactId}/${project.artifactId}</path>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-	</build>
 </project>
\ No newline at end of file
diff --git a/httpchannel-service/httpchannel-service-4shared/src/main/java/org/httpchannel/service/fourshared/FourSharedService.java b/httpchannel-service/httpchannel-service-4shared/src/main/java/com/rogiel/httpchannel/service/fourshared/FourSharedService.java
similarity index 96%
rename from httpchannel-service/httpchannel-service-4shared/src/main/java/org/httpchannel/service/fourshared/FourSharedService.java
rename to httpchannel-service/httpchannel-service-4shared/src/main/java/com/rogiel/httpchannel/service/fourshared/FourSharedService.java
index 96390ee..21cb9be 100644
--- a/httpchannel-service/httpchannel-service-4shared/src/main/java/org/httpchannel/service/fourshared/FourSharedService.java
+++ b/httpchannel-service/httpchannel-service-4shared/src/main/java/com/rogiel/httpchannel/service/fourshared/FourSharedService.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.httpchannel.service.fourshared;
+package com.rogiel.httpchannel.service.fourshared;
 
 import java.io.IOException;
 import java.util.concurrent.ExecutionException;
diff --git a/httpchannel-service/httpchannel-service-4shared/src/main/java/org/httpchannel/service/fourshared/FourSharedUploaderConfiguration.java b/httpchannel-service/httpchannel-service-4shared/src/main/java/com/rogiel/httpchannel/service/fourshared/FourSharedUploaderConfiguration.java
similarity index 94%
rename from httpchannel-service/httpchannel-service-4shared/src/main/java/org/httpchannel/service/fourshared/FourSharedUploaderConfiguration.java
rename to httpchannel-service/httpchannel-service-4shared/src/main/java/com/rogiel/httpchannel/service/fourshared/FourSharedUploaderConfiguration.java
index 9b8c87a..737ede6 100644
--- a/httpchannel-service/httpchannel-service-4shared/src/main/java/org/httpchannel/service/fourshared/FourSharedUploaderConfiguration.java
+++ b/httpchannel-service/httpchannel-service-4shared/src/main/java/com/rogiel/httpchannel/service/fourshared/FourSharedUploaderConfiguration.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.httpchannel.service.fourshared;
+package com.rogiel.httpchannel.service.fourshared;
 
 import com.rogiel.httpchannel.service.AbstractUploaderConfiguration;
 import com.rogiel.httpchannel.service.Uploader.DescriptionableUploaderConfiguration;
diff --git a/httpchannel-service/httpchannel-service-4shared/src/main/resources/META-INF/services/com.rogiel.httpchannel.service.Service b/httpchannel-service/httpchannel-service-4shared/src/main/resources/META-INF/services/com.rogiel.httpchannel.service.Service
index 5ba0742..5d429fa 100644
--- a/httpchannel-service/httpchannel-service-4shared/src/main/resources/META-INF/services/com.rogiel.httpchannel.service.Service
+++ b/httpchannel-service/httpchannel-service-4shared/src/main/resources/META-INF/services/com.rogiel.httpchannel.service.Service
@@ -1 +1 @@
-org.httpchannel.service.fourshared.FourSharedService
\ No newline at end of file
+com.rogiel.httpchannel.service.fourshared.FourSharedService
\ No newline at end of file
diff --git a/httpchannel-service/httpchannel-service-4shared/src/test/java/org/httpchannel/service/fourshared/FourSharedServiceTest.java b/httpchannel-service/httpchannel-service-4shared/src/test/java/com/rogiel/httpchannel/service/fourshared/FourSharedServiceTest.java
similarity index 87%
rename from httpchannel-service/httpchannel-service-4shared/src/test/java/org/httpchannel/service/fourshared/FourSharedServiceTest.java
rename to httpchannel-service/httpchannel-service-4shared/src/test/java/com/rogiel/httpchannel/service/fourshared/FourSharedServiceTest.java
index d6182de..e9df33d 100644
--- a/httpchannel-service/httpchannel-service-4shared/src/test/java/org/httpchannel/service/fourshared/FourSharedServiceTest.java
+++ b/httpchannel-service/httpchannel-service-4shared/src/test/java/com/rogiel/httpchannel/service/fourshared/FourSharedServiceTest.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package org.httpchannel.service.fourshared;
+package com.rogiel.httpchannel.service.fourshared;
 
 import java.io.IOException;
 import java.net.URI;
@@ -15,6 +15,7 @@ import junit.framework.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
+import com.rogiel.httpchannel.service.fourshared.FourSharedService;
 import com.rogiel.httpchannel.service.helper.AuthenticationServices;
 import com.rogiel.httpchannel.util.ChannelUtils;
 
diff --git a/httpchannel-service/pom.xml b/httpchannel-service/pom.xml
index 64f6728..2efec5f 100644
--- a/httpchannel-service/pom.xml
+++ b/httpchannel-service/pom.xml
@@ -40,18 +40,4 @@
 			<version>1.0.1-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
-
-	<build>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>com.github.github</groupId>
-					<artifactId>site-maven-plugin</artifactId>
-					<configuration>
-						<path>/${project.parent.artifactId}/${project.artifactId}</path>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-	</build>
 </project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index b8197d0..cf6db07 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,6 +22,11 @@
 	</scm>
 	<distributionManagement>
 		<downloadUrl>http://github.com/seedbox/httpchannel/downloads</downloadUrl>
+		<site>
+			<id>httpchannel-site</id>
+			<name>HttpChannel site</name>
+			<url>gitsite:git@github.com/seedbox/httpchannel.github.com.git</url>
+		</site>
 		<repository>
 			<id>sonatype-nexus-staging</id>
 			<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
@@ -76,6 +81,25 @@
 
 	<build>
 		<defaultGoal>package</defaultGoal>
+
+		<extensions>
+			<extension>
+				<groupId>org.apache.maven.scm</groupId>
+				<artifactId>maven-scm-provider-gitexe</artifactId>
+				<version>1.6</version>
+			</extension>
+			<extension>
+				<groupId>org.apache.maven.scm</groupId>
+				<artifactId>maven-scm-manager-plexus</artifactId>
+				<version>1.6</version>
+			</extension>
+			<extension>
+				<groupId>org.kathrynhuxtable.maven.wagon</groupId>
+				<artifactId>wagon-gitsite</artifactId>
+				<version>0.3.1</version>
+			</extension>
+		</extensions>
+
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -128,7 +152,6 @@
 				<artifactId>maven-site-plugin</artifactId>
 				<version>3.0</version>
 				<configuration>
-					<skipDeploy>true</skipDeploy> <!-- site is deployed with github plugin -->
 					<outputEncoding>UTF-8</outputEncoding>
 					<reportPlugins>
 						<plugin>
@@ -167,26 +190,6 @@
 					</reportPlugins>
 				</configuration>
 			</plugin>
-			<plugin>
-				<groupId>com.github.github</groupId>
-				<artifactId>site-maven-plugin</artifactId>
-				<version>0.4</version>
-				<configuration>
-					<message>Creating ${project.artifactId} site for ${project.version}</message>
-					<repositoryOwner>seedbox</repositoryOwner>
-					<repositoryName>httpchannel.github.com</repositoryName>
-					<merge>true</merge>
-					<path>/</path>
-				</configuration>
-				<executions>
-					<execution>
-						<phase>site-deploy</phase>
-						<goals>
-							<goal>site</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
 			<plugin>
 				<groupId>com.github.github</groupId>
 				<artifactId>downloads-maven-plugin</artifactId>
@@ -228,17 +231,6 @@
 				</executions>
 			</plugin>
 		</plugins>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>com.github.github</groupId>
-					<artifactId>site-maven-plugin</artifactId>
-					<configuration>
-						<path>/${project.artifactId}</path>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
 	</build>
 
 	<profiles>