diff --git a/sc2/ChangeLog b/sc2/ChangeLog
index e3cf3d198..971ad1201 100644
--- a/sc2/ChangeLog
+++ b/sc2/ChangeLog
@@ -1,4 +1,5 @@
 Changes towards version 0.7:
+- Addon zips can live in content/addons directly - Michael
 - 3DO music separated into an addon pack - Michael
 - Major change in resource index scheme - Michael
   - .lst replaced (mapping to IDs instead of to files)
diff --git a/sc2/src/options.c b/sc2/src/options.c
index 55923ebaf..fec1a7aa6 100644
--- a/sc2/src/options.c
+++ b/sc2/src/options.c
@@ -325,6 +325,8 @@ mountContentDir (uio_Repository *repository, const char *contentPath)
 				"options are ignored.");
 		return;
 	}
+
+	mountDirZips (contentHandle, addonsDir, "addons");
 			
 	availableAddons = uio_getDirList (addonsDir, "", "", match_MATCH_PREFIX);
 	if (availableAddons != NULL)