diff --git a/tools/droiddoc/src/SampleCode.java b/tools/droiddoc/src/SampleCode.java
index 1f00be2..bf54445 100644
--- a/tools/droiddoc/src/SampleCode.java
+++ b/tools/droiddoc/src/SampleCode.java
@@ -44,7 +44,7 @@
             System.out.println("-samplecode not a directory: " + mSource);
             return;
         }
-        if (offlineMode) writeIndexOnly(f, mDest);
+        if (offlineMode) writeIndexOnly(f, mDest, offlineMode);
         else writeDirectory(f, mDest);
     }
 
@@ -118,9 +118,10 @@
         ClearPage.write(hdf, "sampleindex.cs", relative + "/index" + DroidDoc.htmlExtension);
     }
 
-    public void writeIndexOnly(File dir, String relative) {
+    public void writeIndexOnly(File dir, String relative, Boolean offline) {
         HDF hdf = writeIndex(dir);
-        ClearPage.write(hdf, "sampleindex.cs", relative + "/index" +
+        if (!offline) relative = "/" + relative;
+        ClearPage.write(hdf, "sampleindex.cs", relative + "index" +
                         DroidDoc.htmlExtension);
     }
 
