diff --git a/Makefile b/Makefile
index a906d0bf..baa06c40 100644
--- a/Makefile
+++ b/Makefile
@@ -5,12 +5,30 @@ PREFIX = .
 DOCS_DIR = ${PREFIX}/docs
 TEST_DIR = ${PREFIX}/test
 DIST_DIR = ${PREFIX}/dist
+PLUG_DIR = ../plugins
 
-MODULES = ${SRC_DIR}/intro.js\
-	${SRC_DIR}/jquery/*\
+BASE_FILES = ${SRC_DIR}/jquery/*\
 	${SRC_DIR}/event/*\
 	${SRC_DIR}/fx/*\
-	${SRC_DIR}/ajax/*\
+	${SRC_DIR}/ajax/*
+
+PLUGINS = ${PLUG_DIR}/button/*\
+	${PLUG_DIR}/center/*\
+	${PLUG_DIR}/cookie/*\
+	${PLUG_DIR}/form/*\
+	${PLUG_DIR}/greybox/greybox.js\
+	${PLUG_DIR}/interface/*\
+	${PLUG_DIR}/pager/*\
+	${PLUG_DIR}/tablesorter/*\
+	${PLUG_DIR}/tabs/*
+
+MODULES = ${SRC_DIR}/intro.js\
+	${BASE_FILES}\
+	${SRC_DIR}/outro.js
+
+MODULES_WITH_PLUGINS = ${SRC_DIR}/intro.js\
+	${BASE_FILES}\
+	${PLUGINS}\
 	${SRC_DIR}/outro.js
 
 JQ = ${DIST_DIR}/jquery.js
@@ -39,6 +57,15 @@ ${JQ}: ${MODULES}
 	@@echo ${JQ} "Built"
 	@@echo
 
+with_plugins: ${MODULES_WITH_PLUGINS}
+	@@echo "Building" ${JQ}
+
+	@@mkdir -p ${DIST_DIR}
+	@@cat ${MODULES_WITH_PLUGINS} | ${VER} > ${JQ};
+
+	@@echo ${JQ} "Built"
+	@@echo
+
 lite: ${JQ_LITE}
 
 ${JQ_LITE}: ${JQ}
diff --git a/build.xml b/build.xml
index 0919aaa8..024dcd79 100644
--- a/build.xml
+++ b/build.xml
@@ -38,6 +38,29 @@
         </concat>
         <echo message="${JQ} built." />
     </target>
+
+    <target name="with_plugins">
+        <echo message="Building ${JQ}" />
+        <mkdir dir="${DIST_DIR}" />
+        <concat destfile="${JQ}">
+        	<fileset dir="${SRC_DIR}" includes="intro.js" />
+            <fileset dir="${SRC_DIR}" includes="jquery/*.js" />
+            <fileset dir="${SRC_DIR}" includes="event/*.js" />
+            <fileset dir="${SRC_DIR}" includes="fx/*.js" />
+            <fileset dir="${SRC_DIR}" includes="ajax/*.js" />
+						<fileset dir="${PLUGIN_DIR}" includes="button/*.js" />
+						<fileset dir="${PLUGIN_DIR}" includes="center/*.js" />
+						<fileset dir="${PLUGIN_DIR}" includes="cookie/*.js" />
+						<fileset dir="${PLUGIN_DIR}" includes="form/*.js" />
+						<fileset dir="${PLUGIN_DIR}" includes="greybox/*.js" />
+						<fileset dir="${PLUGIN_DIR}" includes="interface/*.js" />
+						<fileset dir="${PLUGIN_DIR}" includes="pager/*.js" />
+						<fileset dir="${PLUGIN_DIR}" includes="tablesorter/*.js" />
+						<fileset dir="${PLUGIN_DIR}" includes="tabs/*.js" />
+    		<fileset dir="${SRC_DIR}" includes="outro.js" />
+        </concat>
+        <echo message="${JQ} built." />
+    </target>
 
     <target name="lite" depends="jquery">
         <echo message="Building ${JQ_LITE}" />
@@ -67,7 +90,17 @@
             <arg value="${JQ_PACK}" />
         </java>
         <echo message="${JQ_PACK} built." />
-    </target>
+    </target>
+		
+    <target name="pack_with_plugins" depends="with_plugins">
+        <echo message="Building ${JQ_PACK}" />
+        <java jar="${JAR}" fork="true">
+            <arg value="${BUILD_DIR}/build/pack.js" />
+            <arg value="${JQ}" />
+            <arg value="${JQ_PACK}" />
+        </java>
+        <echo message="${JQ_PACK} built." />
+    </target>		
 
     <target name="test" depends="jquery">
         <echo message="Building Test Suite" />
@@ -106,7 +139,31 @@
             <arg value="${DOCS_DIR}" />
         </java>
         <echo message="Documentation built." />
-    </target>
+    </target>
+		
+    <target name="docs_with_plugins" depends="with_plugins">
+        <echo message="Building Documentation" />
+        <delete dir="${DOCS_DIR}" />
+        <mkdir dir="${DOCS_DIR}/data" />
+    	<copy todir="${DOCS_DIR}" file="${BUILD_DIR}/docs/.htaccess" />
+        <mkdir dir="${DOCS_DIR}/js" />
+        <copy todir="${DOCS_DIR}/js" >
+            <fileset dir="${BUILD_DIR}/docs/js">
+                <include name="**/*.js"/>
+            </fileset>
+        </copy>
+		<copy todir="${DOCS_DIR}/style" >
+            <fileset dir="${BUILD_DIR}/docs/style">
+                <include name="**"/>
+            </fileset>
+        </copy>
+        <java jar="${JAR}" fork="true">
+            <arg value="${BUILD_DIR}/docs/docs.js" />
+            <arg value="${JQ}" />
+            <arg value="${DOCS_DIR}" />
+        </java>
+        <echo message="Documentation built." />
+    </target>		
 
     <target name="clean">
         <delete dir="${DOCS_DIR}" />