diff --git a/java/src/com/tigervnc/vncviewer/MANIFEST.MF b/java/src/com/tigervnc/vncviewer/MANIFEST.MF
index 9ddbfbc..b3574fe 100644
--- a/java/src/com/tigervnc/vncviewer/MANIFEST.MF
+++ b/java/src/com/tigervnc/vncviewer/MANIFEST.MF
@@ -1,2 +1,2 @@
 Manifest-Version: 1.0
-Main-Class: VncViewer
+Main-Class: com.tigervnc.vncviewer.VncViewer
diff --git a/java/src/com/tigervnc/vncviewer/Makefile b/java/src/com/tigervnc/vncviewer/Makefile
index 01cf48b..46752ab 100644
--- a/java/src/com/tigervnc/vncviewer/Makefile
+++ b/java/src/com/tigervnc/vncviewer/Makefile
@@ -35,7 +35,12 @@
 	$(JC) $(JCFLAGS) -O $(SOURCES)
 
 $(ARCHIVE): $(CLASSES) $(MANIFEST)
-	$(JAR) cfm $(ARCHIVE) $(MANIFEST) $(CLASSES)
+	cd ../../..; \
+	$(JAR) cfm com/tigervnc/vncviewer/$(ARCHIVE) \
+		com/tigervnc/vncviewer/$(MANIFEST) \
+		com/tigervnc/vncviewer/*.class \
+		com/tigervnc/decoder/*.class \
+		com/tigervnc/decoder/common/*.class
 
 install: $(CLASSES) $(ARCHIVE)
 	$(CP) $(CLASSES) $(ARCHIVE) $(PAGES) $(INSTALL_DIR)
@@ -44,4 +49,4 @@
 	@$(ExportJavaClasses)
 
 clean::
-	$(RM) *.class *.jar
+	$(RM) *.class *.jar ../decoder/*.class ../decoder/common/*.class
diff --git a/java/src/com/tigervnc/vncviewer/index.html b/java/src/com/tigervnc/vncviewer/index.html
index 96805dc..a582b2d 100644
--- a/java/src/com/tigervnc/vncviewer/index.html
+++ b/java/src/com/tigervnc/vncviewer/index.html
@@ -20,7 +20,7 @@
 <TITLE>
 TigerVNC desktop
 </TITLE>
-<APPLET CODE="VncViewer.class" ARCHIVE="VncViewer.jar"
+<APPLET CODE="com.tigervnc.vncviewer.VncViewer" ARCHIVE="VncViewer.jar"
         WIDTH="800" HEIGHT="632">
 <PARAM NAME="PORT" VALUE="5901">
 </APPLET>