diff --git a/Makefile b/Makefile
index b0351cc3..9fcdd808 100644
--- a/Makefile
+++ b/Makefile
@@ -7,10 +7,10 @@ TEST_DIR = ${PREFIX}/test
DIST_DIR = ${PREFIX}/dist
PLUG_DIR = ../plugins
-BASE_FILES = ${SRC_DIR}/jquery/*\
- ${SRC_DIR}/event/*\
- ${SRC_DIR}/fx/*\
- ${SRC_DIR}/ajax/*
+BASE_FILES = ${SRC_DIR}/jquery/jquery.js\
+ ${SRC_DIR}/event/event.js\
+ ${SRC_DIR}/fx/fx.js\
+ ${SRC_DIR}/ajax/ajax.js
PLUGINS = ${PLUG_DIR}/button/*\
${PLUG_DIR}/center/*\
@@ -22,7 +22,9 @@ PLUGINS = ${PLUG_DIR}/button/*\
${PLUG_DIR}/interface/*\
${PLUG_DIR}/pager/*\
${PLUG_DIR}/tablesorter/*\
- ${PLUG_DIR}/tabs/*
+ ${PLUG_DIR}/tabs/*\
+ ${PLUG_DIR}/tooltip/jquery.tooltip.js\
+ ${PLUG_DIR}/accordion/jquery.accordion.js
MODULES = ${SRC_DIR}/intro.js\
${BASE_FILES}\
diff --git a/build.xml b/build.xml
index 7424dbf4..e2a415a9 100644
--- a/build.xml
+++ b/build.xml
@@ -25,7 +25,7 @@
+ value="button/*.js,center/*.js,cookie/*.js,form/*.js,greybox/*.js,interface/*.js,pager/*.js,tablesorter/*.js,tabs/*.js,tooltip/*.js,accordion/*.js" />