diff --git a/configure.ac b/configure.ac
index 94ec6bc..39728d9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -917,7 +917,8 @@ AC_CONFIG_FILES([Makefile
 	examples/android/Makefile
 	vncterm/Makefile
 	webclients/Makefile
-	webclients/ssl/Makefile
+	webclients/java-applet/Makefile
+	webclients/java-applet/ssl/Makefile
 	libvncclient/Makefile
 	client_examples/Makefile
 	test/Makefile
diff --git a/webclients/Makefile.am b/webclients/Makefile.am
index c5497a8..6c2db84 100644
--- a/webclients/Makefile.am
+++ b/webclients/Makefile.am
@@ -1,5 +1,4 @@
-EXTRA_DIST=VncViewer.jar  index.vnc  javaviewer.pseudo_proxy.patch
-
-SUBDIRS = ssl
-DIST_SUBDIRS = ssl
+SUBDIRS = java-applet
+DIST_SUBDIRS = java-applet
+EXTRA_DIST=index.vnc novnc
 
diff --git a/webclients/index.vnc b/webclients/index.vnc
index 34ad25d..8254a70 100644
--- a/webclients/index.vnc
+++ b/webclients/index.vnc
@@ -10,7 +10,7 @@
 $USER's $DESKTOP desktop ($DISPLAY)
 </TITLE>
 </head> 
-<APPLET CODE=VncViewer.class ARCHIVE=VncViewer.jar
+<APPLET CODE=VncViewer.class ARCHIVE=java-applet/VncViewer.jar
         WIDTH=$APPLETWIDTH HEIGHT=$APPLETHEIGHT>
 <param name=PORT value=$PORT>
 <param name="Open New Window" value=yes>
diff --git a/webclients/java-applet/Makefile.am b/webclients/java-applet/Makefile.am
new file mode 100644
index 0000000..d6d10e4
--- /dev/null
+++ b/webclients/java-applet/Makefile.am
@@ -0,0 +1,5 @@
+EXTRA_DIST=VncViewer.jar javaviewer.pseudo_proxy.patch
+
+SUBDIRS = ssl
+DIST_SUBDIRS = ssl
+
diff --git a/webclients/VncViewer.jar b/webclients/java-applet/VncViewer.jar
similarity index 100%
rename from webclients/VncViewer.jar
rename to webclients/java-applet/VncViewer.jar
diff --git a/webclients/javaviewer.pseudo_proxy.patch b/webclients/java-applet/javaviewer.pseudo_proxy.patch
similarity index 100%
rename from webclients/javaviewer.pseudo_proxy.patch
rename to webclients/java-applet/javaviewer.pseudo_proxy.patch
diff --git a/webclients/ssl/Makefile.am b/webclients/java-applet/ssl/Makefile.am
similarity index 100%
rename from webclients/ssl/Makefile.am
rename to webclients/java-applet/ssl/Makefile.am
diff --git a/webclients/ssl/README b/webclients/java-applet/ssl/README
similarity index 100%
rename from webclients/ssl/README
rename to webclients/java-applet/ssl/README
diff --git a/webclients/ssl/SignedUltraViewerSSL.jar b/webclients/java-applet/ssl/SignedUltraViewerSSL.jar
similarity index 100%
rename from webclients/ssl/SignedUltraViewerSSL.jar
rename to webclients/java-applet/ssl/SignedUltraViewerSSL.jar
diff --git a/webclients/ssl/SignedVncViewer.jar b/webclients/java-applet/ssl/SignedVncViewer.jar
similarity index 100%
rename from webclients/ssl/SignedVncViewer.jar
rename to webclients/java-applet/ssl/SignedVncViewer.jar
diff --git a/webclients/ssl/UltraViewerSSL.jar b/webclients/java-applet/ssl/UltraViewerSSL.jar
similarity index 100%
rename from webclients/ssl/UltraViewerSSL.jar
rename to webclients/java-applet/ssl/UltraViewerSSL.jar
diff --git a/webclients/ssl/VncViewer.jar b/webclients/java-applet/ssl/VncViewer.jar
similarity index 100%
rename from webclients/ssl/VncViewer.jar
rename to webclients/java-applet/ssl/VncViewer.jar
diff --git a/webclients/ssl/index.vnc b/webclients/java-applet/ssl/index.vnc
similarity index 100%
rename from webclients/ssl/index.vnc
rename to webclients/java-applet/ssl/index.vnc
diff --git a/webclients/ssl/onetimekey b/webclients/java-applet/ssl/onetimekey
similarity index 100%
rename from webclients/ssl/onetimekey
rename to webclients/java-applet/ssl/onetimekey
diff --git a/webclients/ssl/proxy.vnc b/webclients/java-applet/ssl/proxy.vnc
similarity index 100%
rename from webclients/ssl/proxy.vnc
rename to webclients/java-applet/ssl/proxy.vnc
diff --git a/webclients/ssl/ss_vncviewer b/webclients/java-applet/ssl/ss_vncviewer
similarity index 100%
rename from webclients/ssl/ss_vncviewer
rename to webclients/java-applet/ssl/ss_vncviewer
diff --git a/webclients/ssl/tightvnc-1.3dev7_javasrc-vncviewer-cursor-colors+no-tab-traversal.patch b/webclients/java-applet/ssl/tightvnc-1.3dev7_javasrc-vncviewer-cursor-colors+no-tab-traversal.patch
similarity index 100%
rename from webclients/ssl/tightvnc-1.3dev7_javasrc-vncviewer-cursor-colors+no-tab-traversal.patch
rename to webclients/java-applet/ssl/tightvnc-1.3dev7_javasrc-vncviewer-cursor-colors+no-tab-traversal.patch
diff --git a/webclients/ssl/tightvnc-1.3dev7_javasrc-vncviewer-ssl.patch b/webclients/java-applet/ssl/tightvnc-1.3dev7_javasrc-vncviewer-ssl.patch
similarity index 100%
rename from webclients/ssl/tightvnc-1.3dev7_javasrc-vncviewer-ssl.patch
rename to webclients/java-applet/ssl/tightvnc-1.3dev7_javasrc-vncviewer-ssl.patch
diff --git a/webclients/ssl/ultra.vnc b/webclients/java-applet/ssl/ultra.vnc
similarity index 100%
rename from webclients/ssl/ultra.vnc
rename to webclients/java-applet/ssl/ultra.vnc
diff --git a/webclients/ssl/ultraproxy.vnc b/webclients/java-applet/ssl/ultraproxy.vnc
similarity index 100%
rename from webclients/ssl/ultraproxy.vnc
rename to webclients/java-applet/ssl/ultraproxy.vnc
diff --git a/webclients/ssl/ultrasigned.vnc b/webclients/java-applet/ssl/ultrasigned.vnc
similarity index 100%
rename from webclients/ssl/ultrasigned.vnc
rename to webclients/java-applet/ssl/ultrasigned.vnc
diff --git a/webclients/ssl/ultravnc-102-JavaViewer-ssl-etc.patch b/webclients/java-applet/ssl/ultravnc-102-JavaViewer-ssl-etc.patch
similarity index 100%
rename from webclients/ssl/ultravnc-102-JavaViewer-ssl-etc.patch
rename to webclients/java-applet/ssl/ultravnc-102-JavaViewer-ssl-etc.patch