diff --git a/build/build-cloud.xml b/build/build-cloud.xml
index 853a30af45f..d03eb7fa6e2 100755
--- a/build/build-cloud.xml
+++ b/build/build-cloud.xml
@@ -78,7 +78,7 @@
   <property name="server.test.dir" location="${server.dir}/test" />
   <property name="server.dist.dir" location="${dist.dir}/client" />
   <property name="db.scripts.dir" location="${target.dir}/db"/>
-  <property name="apidoc.scripts.dir" location="${base.dir}/setup/bin/apidoc/"/>
+  <property name="apidoc.scripts.dir" location="${base.dir}/setup/apidoc/"/>
 
   <!-- directories for core code compilation-->
   <property name="core.dir" location="${base.dir}/core" />
diff --git a/setup/apidoc/build-apidoc.sh b/setup/apidoc/build-apidoc.sh
new file mode 100644
index 00000000000..e8c61e2742e
--- /dev/null
+++ b/setup/apidoc/build-apidoc.sh
@@ -0,0 +1,49 @@
+#!/usr/bin/env bash
+  #
+  # Copyright (C) 2010 Cloud.com, Inc.  All rights reserved.
+  # 
+  # This software is licensed under the GNU General Public License v3 or later.
+  # 
+  # It is free software: you can redistribute it and/or modify
+  # it under the terms of the GNU General Public License as published by
+  # the Free Software Foundation, either version 3 of the License, or any later version.
+  # This program is distributed in the hope that it will be useful,
+  # but WITHOUT ANY WARRANTY; without even the implied warranty of
+  # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  # GNU General Public License for more details.
+  # 
+  # You should have received a copy of the GNU General Public License
+  # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  #
+ 
+
+# cloud-build-api-doc.sh -- builds api documentation.
+#set -x
+set -u
+TARGETJARDIR="$1"
+shift
+DEPSDIR="$1"
+shift
+
+PATHSEP=':'
+if [[ $OSTYPE == "cygwin" ]] ; then
+  PATHSEP=';'
+fi
+
+CP=$PATHSEP/
+
+for file in $TARGETJARDIR/*.jar
+do
+  CP=${CP}$PATHSEP$file
+done
+
+for file in $DEPSDIR/*.jar; do
+  CP=${CP}$PATHSEP$file
+done
+
+java -cp $CP com.cloud.api.doc.ApiXmlDocWriter $*
+
+if [ $? -ne 0 ]
+then
+	exit 1
+fi