diff --git a/Makefile.am b/Makefile.am
index 8dcf71829..03f636cde 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,10 +22,10 @@ SUBDIRS = \
   $(DAEMON_DIR) \
   $(CLI_DIR) \
   $(GTK_DIR) \
-  $(MAC_DIR)
+  $(MAC_DIR) \
+  web
 
 EXTRA_DIST = \
-  web \
   qt \
   NEWS \
   AUTHORS \
@@ -35,65 +35,9 @@ EXTRA_DIST = \
   update-version-h.sh \
   Transmission.xcodeproj/project.pbxproj
 
-clutchdir = $(datadir)/transmission/web
-clutch_DATA = \
-  web/index.html \
-  web/LICENSE
+dist-hook:
+	rm -rf `find $(distdir)/qt -name .svn`
 
-clutch_cssdir = $(clutchdir)/stylesheets
-clutch_css_DATA = \
-  web/stylesheets/iphone.css \
-  web/stylesheets/common.css \
-  web/stylesheets/ie6.css \
-  web/stylesheets/ie7.css
-
-clutch_jsdir = $(clutchdir)/javascript
-clutch_js_DATA = \
-  web/javascript/menu.js \
-  web/javascript/dialog.js \
-  web/javascript/transmission.js \
-  web/javascript/transmission.remote.js \
-  web/javascript/common.js \
-  web/javascript/torrent.js
-
-clutch_jquerydir = $(clutch_jsdir)/jquery
-clutch_jquery_DATA = \
-  web/javascript/jquery/json.min.js \
-  web/javascript/jquery/jquery.contextmenu.min.js \
-  web/javascript/jquery/jquery.min.js \
-  web/javascript/jquery/jquery.form.min.js \
-  web/javascript/jquery/jquery.transmenu.min.js
-
-clutch_imagesdir = $(clutchdir)/images
-clutch_images_DATA = \
-  web/images/favicon.ico \
-  web/images/favicon.png \
-  web/images/webclip-icon.png
-
-clutch_graphicsdir = $(clutch_imagesdir)/graphics
-clutch_graphics_DATA = \
-  web/images/graphics/logo.png \
-  web/images/graphics/chrome.png \
-  web/images/graphics/iphone_chrome.png \
-  web/images/graphics/filter_bar.png \
-  web/images/graphics/filter_icon.png \
-  web/images/graphics/transfer_arrows.png
-
-clutch_progressdir = $(clutch_imagesdir)/progress
-clutch_progress_DATA = \
-  web/images/progress/progress.png
-
-clutch_buttonsdir = $(clutch_imagesdir)/buttons
-clutch_buttons_DATA = \
-  web/images/buttons/tab_backgrounds.png \
-  web/images/buttons/toolbar_buttons.png \
-  web/images/buttons/info_general.png \
-  web/images/buttons/torrent_buttons.png \
-  web/images/buttons/info_activity.png \
-  web/images/buttons/file_priority_buttons.png \
-  web/images/buttons/file_wanted_buttons.png \
-  web/images/buttons/info_files.png \
-  web/images/buttons/cancel.png
 
 DISTCLEANFILES = \
   intltool-extract \
diff --git a/configure.ac b/configure.ac
index be515022c..596f5633c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -446,6 +446,14 @@ AC_CONFIG_FILES([Makefile
                  macosx/Makefile
                  gtk/Makefile
                  gtk/icons/Makefile
+                 web/Makefile
+                 web/images/Makefile
+                 web/images/buttons/Makefile
+                 web/images/graphics/Makefile
+                 web/images/progress/Makefile
+                 web/javascript/Makefile
+                 web/javascript/jquery/Makefile
+                 web/stylesheets/Makefile
                  po/Makefile.in])
 
 ac_configure_args="$ac_configure_args --enable-static --disable-shared -q"
diff --git a/web/Makefile.am b/web/Makefile.am
new file mode 100644
index 000000000..c2e395b1e
--- /dev/null
+++ b/web/Makefile.am
@@ -0,0 +1,11 @@
+datadir = ${datarootdir}/${PACKAGE_NAME}/${subdir}
+
+data_DATA = \
+  index.html \
+  LICENSE
+
+SUBDIRS = \
+  images \
+  javascript \
+  stylesheets
+
diff --git a/web/images/Makefile.am b/web/images/Makefile.am
new file mode 100644
index 000000000..1d869bd2c
--- /dev/null
+++ b/web/images/Makefile.am
@@ -0,0 +1,11 @@
+datadir = ${datarootdir}/${PACKAGE_NAME}/${subdir}
+
+data_DATA = \
+  favicon.ico \
+  favicon.png \
+  webclip-icon.png 
+
+SUBDIRS = \
+  buttons \
+  graphics \
+  progress
diff --git a/web/images/buttons/Makefile.am b/web/images/buttons/Makefile.am
new file mode 100644
index 000000000..a9bf92ff5
--- /dev/null
+++ b/web/images/buttons/Makefile.am
@@ -0,0 +1,12 @@
+datadir = ${datarootdir}/${PACKAGE_NAME}/${subdir}
+
+data_DATA = \
+  cancel.png \
+  file_priority_buttons.png \
+  file_wanted_buttons.png \
+  info_activity.png \
+  info_files.png \
+  info_general.png \
+  tab_backgrounds.png \
+  toolbar_buttons.png \
+  torrent_buttons.png
diff --git a/web/images/graphics/Makefile.am b/web/images/graphics/Makefile.am
new file mode 100644
index 000000000..df122a529
--- /dev/null
+++ b/web/images/graphics/Makefile.am
@@ -0,0 +1,9 @@
+datadir = ${datarootdir}/${PACKAGE_NAME}/${subdir}
+
+data_DATA = \
+  chrome.png \
+  filter_bar.png \
+  filter_icon.png \
+  iphone_chrome.png \
+  logo.png \
+  transfer_arrows.png
diff --git a/web/images/progress/Makefile.am b/web/images/progress/Makefile.am
new file mode 100644
index 000000000..71f3cdc53
--- /dev/null
+++ b/web/images/progress/Makefile.am
@@ -0,0 +1,4 @@
+datadir = ${datarootdir}/${PACKAGE_NAME}/${subdir}
+
+data_DATA = \
+  progress.png
diff --git a/web/javascript/Makefile.am b/web/javascript/Makefile.am
new file mode 100644
index 000000000..d5403f298
--- /dev/null
+++ b/web/javascript/Makefile.am
@@ -0,0 +1,12 @@
+datadir = ${datarootdir}/${PACKAGE_NAME}/${subdir}
+
+data_DATA = \
+  common.js \
+  dialog.js \
+  menu.js \
+  torrent.js \
+  transmission.js \
+  transmission.remote.js
+
+SUBDIRS = \
+  jquery
diff --git a/web/javascript/jquery/Makefile.am b/web/javascript/jquery/Makefile.am
new file mode 100644
index 000000000..925a3703f
--- /dev/null
+++ b/web/javascript/jquery/Makefile.am
@@ -0,0 +1,8 @@
+datadir = ${datarootdir}/${PACKAGE_NAME}/${subdir}
+
+data_DATA = \
+  json.min.js \
+  jquery.contextmenu.min.js \
+  jquery.min.js \
+  jquery.form.min.js \
+  jquery.transmenu.min.js
diff --git a/web/stylesheets/Makefile.am b/web/stylesheets/Makefile.am
new file mode 100644
index 000000000..02fcfa5b9
--- /dev/null
+++ b/web/stylesheets/Makefile.am
@@ -0,0 +1,7 @@
+datadir = ${datarootdir}/${PACKAGE_NAME}/${subdir}
+
+data_DATA = \
+  common.css \
+  ie6.css \
+  ie7.css \
+  iphone.css