diff --git a/.htaccess b/.htaccess
index 6ff83b2..bdcbac5 100644
--- a/.htaccess
+++ b/.htaccess
@@ -1 +1 @@
-Redirect	/index.html	https://apache.github.io/incubator-heron/
+Redirect	/index.html	https://heron.incubator.apache.org
diff --git a/website2/website/Makefile b/website2/website/Makefile
index 1465eb0..7c25991 100644
--- a/website2/website/Makefile
+++ b/website2/website/Makefile
@@ -11,3 +11,6 @@
 	@scripts/javadocs.sh
 	@scripts/python-doc-gen.sh 0.0.0
 	@scripts/build-site.sh
+
+publish:
+	@scripts/publish_site.sh
diff --git a/website2/website/scripts/publish_site.sh b/website2/website/scripts/publish_site.sh
new file mode 100755
index 0000000..575b399
--- /dev/null
+++ b/website2/website/scripts/publish_site.sh
@@ -0,0 +1,36 @@
+#!/bin/bash
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+ROOT_DIR=$(git rev-parse --show-toplevel)
+WORK_DIR=${ROOT_DIR}/generated-site/content
+ME=`basename $0`
+
+# push all of the results to asf-site branch
+git checkout asf-site
+git clean -f -d
+git pull origin asf-site
+
+rm -rf ${ROOT_DIR}/content
+mkdir ${ROOT_DIR}/content
+
+cp -a $WORK_DIR/* ${ROOT_DIR}/content
+cp -a ${ROOT_DIR}/.htaccess ${ROOT_DIR}/content
+
+git add ${ROOT_DIR}/content
+git commit -m "git-site-role commit from $ME"
+git push origin asf-site