diff --git a/doc/fixes36.1 b/doc/fixes36.1
index b5fc58221..04d4f53a1 100644
--- a/doc/fixes36.1
+++ b/doc/fixes36.1
@@ -470,6 +470,7 @@ with perm_invent option enabled and no inventory, 'i' put up an empty menu
 charisma affects the leeway in demon lord bribes
 make Vlad slightly tougher
 reduce the amount of gold laying on the floor
+locked chests and large boxes contain more stuff
 
 
 Fixes to Post-3.6.0 Problems that Were Exposed Via git Repository
diff --git a/src/mkobj.c b/src/mkobj.c
index 592633cac..ed59caa9a 100644
--- a/src/mkobj.c
+++ b/src/mkobj.c
@@ -266,10 +266,10 @@ struct obj *box;
         n = 20;
         break;
     case CHEST:
-        n = 5;
+        n = box->olocked ? 7 : 5;
         break;
     case LARGE_BOX:
-        n = 3;
+        n = box->olocked ? 5 : 3;
         break;
     case SACK:
     case OILSKIN_SACK: